[TSVN] Using WinMerge to resolve conflicts?

All,

Is anyone using WinMerge to resolve conflicts? I'm trying to get my
team to switch from SourceSafe and when they come across their source
file with <<<<< and >>>>> conflict markers it pretty much freaks them
out. I'd like it so they never have to see the conflict markers and can
do the full conflict resolution via WinMerge.

The external command line I'm using is:

C:\Program Files\WinMerge\WinMerge.exe %mine %theirs

But what I really need is for %mine to become %merged after they've
merged the files.

On a semi-random note how do I force TSVN to never auto-merge/always
require a manual merge?

Thanks,
Shawn

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Mar 21 19:11:32 2005