That will cause the left side (labeled "Mine") to be editable and it will be the output file when you save in WinMerge. In Arguments use: -e -u -dl "Mine" -wr -dr "Theirs" $LOCAL $REMOTE $MERGED If you decide to use SourceTree (or for any Google searchers with SourceTree), you can use WinMerge for the Merge Tool by setting the Merge Tool to custom, pointing Diff Command to WinMergeU.exe, typically: C:\Program Files (x86)\WinMerge\WinMergeU.exe
0 Comments
Leave a Reply. |