Differences between revisions 1 and 2
⇤ ← Revision 1 as of 2008-11-27 17:43:13 →
Size: 390
Editor: MadsKiilerich
Comment:
← Revision 2 as of 2008-11-28 05:41:57 → ⇥
Size: 295
Editor: The Dude
Comment:
Deletions are marked like this. Additions are marked like this.
Line 8: Line 8:
winmergeu.args=/e /ub /wl /dl other /dr local $other $local $output winmergeu.args=/e /ub /dl other /dr local $other $local $output
Line 11: Line 11:
#winmergeu.regkey=Software\Thingamahoochie\WinMerge
#winmergeu.regappend=\WinMergeU.exex

[http://www.winmerge.org/ WinMerge]

Example configuration, assuming winmergeu.exe is in the path: 

[merge-tools]
winmergeu.priority=100
winmergeu.args=/e /ub /dl other /dr local $other $local $output
winmergeu.fixeol=True
winmergeu.gui=True

Todo: Use the regkey stuff ...

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