Return non-zero exit code from CodeMerge.exe /NOPROMPT when auto-merge fails
Currently CodeMerge.exe /NOPROMPT will exit with a status code of 0 even if automerge failed and conflict markers are present in the output file (>>>>>> theirs ======== base etc). This is really important for scripted scenarios such as Continuous Integration.
2
votes
