Both just do a text based diff in the command line instead of launching the external program. binary difftool=M圜ompare (changed diff= to difftool=) with no luck. binary diff=M圜ompare in my gitattributes file. For detailed info on what is new, read the change log and the release notes. WinMerge 2.16.28 The current WinMerge version is 2.16.28 and was released at. Read the online manual for help using it. cmd file is just: "C:\\M圜ompare.exe" %5 %2 Download WinMerge The easiest way to install WinMerge is to download and run the Installer. Currently, my global config file looks like this: # Differencing ConfigurationĬommand = \"C:\\Users\\\\.gitdiffdrivers\\M圜ompare.cmd\" #This just tries to pass %5 and %2 to the same executable as the difftool entryĬmd = \"C:\\Program Files\\WinMerge\\WinMergeU.exe\" -e -u -dl \"Old $BASE\" -dr \"New $BASE\" \"$LOCAL\" \"$REMOTE\"Ĭmd = \"C:\\\\M圜ompare.exe\" \"$LOCAL\" \"$REMOTE\"
0 Comments
Leave a Reply. |