Article Index

Using WinMerge with Subversion

I'm still using the Subversion command line interface (despite Scott's gentle recommendation that maybe I should graduate to the GUI world), but I've grown out of WinDiff and moved on to WinMerge as my visual diff tool of choice. The process for integrating the tools is the same that I outlined for using WinDiff, except the contents of the batch file should be changed to:

start "WinMerge" /B /WAIT "C:\Program Files\WinMerge\WinMergeU.exe" /e /ub /dl %3 /dr %5 %6 %7

A couple immediate advantages is that you now get descriptive labels for the 2 different file windows (working copy, revision), and you can quickly exit out of a diff by pressing ESC, making it easy to cycle through a folder of modified files.


This is very handy-- thank you!

I have what I think is an improvement -- the latest version of WinMerge allows you to have "single-instance behavior"-- ie. One instance of WinMerge can have several diff sessions (comparisons of pairs of files) open in it.

To use this, just take out the "/WAIT" and add the "/s":

start "WinMerge" /B "C:\Program Files\WinMerge\WinMergeU.exe" /e /s /ub /dl %3 /dr %5 %6 %7
Dan - August 01, 2007 09:26am