Re: Visual merge tool & the diff-cmd config

Ray Johnson wrote:

> Unfortunately, I'm completely stuck on how to get this to work with the
> diff-cmd config. Currently I have the config looking something like
> this:
> diff-cmd = C:\Program Files\TortoiseSVN\TortoiseMerge.exe

You do know, that if you use TSVN, you can double-click the lines og the
update/merge log. And get tortoise-merge run on that file? Especially
usefull for conflicts :)

I prefer getting text-diffs (/usr/bin/diff) when using the command-line,
and tmerge when using the win32-gui.

TortoiseMerge is not the coolest merge-program in the world (that's
emacs+diff3, of course :) but it works really well for the "little
things" conflicts that i usually (3-4 times in a month) get.

-- 
Helge
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org