Improve reporting of Merge failures
Current Merge test output tells you which branch/file a conflict occurs in, but not what the conflict is. This might be a bit tricky to extract, but would definitely help authors if we could.
Current Merge test output tells you which branch/file a conflict occurs in, but not what the conflict is. This might be a bit tricky to extract, but would definitely help authors if we could.