Differences between revisions 3 and 4
Revision 3 as of 2009-01-17 18:14:59
Size: 309
Comment:
Revision 4 as of 2009-05-19 19:31:03
Size: 311
Editor: localhost
Comment: converted to 1.6 markup
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
[http://www.winmerge.org/ WinMerge] [[http://www.winmerge.org/|WinMerge]]

WinMerge

Example configuration:

[merge-tools]
winmergeu.args=/e /ub /dl other /dr local $other $local $output
winmergeu.regkey=Software\Thingamahoochie\WinMerge
winmergeu.regname=Executable
winmergeu.fixeol=True
winmergeu.checkchanged=True
winmergeu.gui=True

WinMerge (last edited 2009-05-19 19:31:03 by localhost)