[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Bug? using WinMerge 2.8 for merge

From: Corn <filip.konvicka_at_gmail.com>
Date: Fri, 30 May 2008 10:16:45 -0700 (PDT)

> >> now that WinMerge 2.8 is actually able to merge :-) I tried to
> >> integrate it with TSVN (the most recent one). I simply tried entering
> >> "C:\Program Files\WinMerge\WinMergeU.exe" %merged
> It would be nice to add that to the docs before the 1.5.0 release. The
> WinMerge command line for diff that we show in our docs has a lot more
> switches. What are the recommended switches and params for merging?

It seems that no other switches have any effect. I thought of -x
(close when no changes, which is probably needless), -e (close on Esc,
which it does anyway), -ub (don't remember in MRU, which it doesn't
anyway) and a few others, but it does not take anything into account.
So probably just %merged.


To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-05-30 19:26:03 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.