I am running
However this will only mark the confits of file_1 (version 123.2) and file_1 (version 123.3).
I would like the outputFile.txt to mark the conflicts as well as the additions.
Code:
~\code\project\version_123.2\file_1.ada ~\code\project\version_123.3\file_1.ada /automerge /force /mergeoutput=outputFile.txt
I would like the outputFile.txt to mark the conflicts as well as the additions.
Comment