Diff for "WinMerge"

Differences between revisions 1 and 3 (spanning 2 versions)

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

-  ⇤ ← Revision 1 as of 2008-11-27 17:43:13 → 
  Size: 390
  Editor: MadsKiilerich
  Comment:
+   ← Revision 3 as of 2009-01-17 18:14:59 → ⇥
  Size: 309
  Editor: PascalQuantin
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 3:
-Example configuration, assuming winmergeu.exe is in the path:
+Example configuration:
 Line 7:
-winmergeu.priority=100
winmergeu.args=/e /ub /wl /dl other /dr local $other $local $output
+winmergeu.args=/e /ub /dl other /dr local $other $local $output
winmergeu.regkey=Software\Thingamahoochie\WinMerge
winmergeu.regname=Executable
-Line 10:
+Line 11:
+winmergeu.checkchanged=True
-Line 11:
+Line 13:
-#winmergeu.regkey=Software\Thingamahoochie\WinMerge
#winmergeu.regappend=\WinMergeU.exex
 Line 14:
-Todo: Use the regkey stuff ...