Re: [TSVN] Diff/Merge utility suggestion

> The third pane (bottom view) is only visible if you resolve a conflict.
> Or if you open three files to compare, not just two.
So if I have a file in SVN. I modify my working copy, then diff it
against the base. It shows the diffs, but no options in the third pane.
Are you saying it only works if I diff against 2 local copies or 3-way?

> You see, _that's_ the feature most diff programs miss: the three way
> diff. And a three way diff is necessary to resolve conflicts.
Coming from GNU/Linux, 3-way file/dir diff isn't so radical. I suspect
it's new on Win32? I completely agree--it's ideal for dealing with
conflicts.

> I know that GNU diff can do that. But I really don't wanna use GNU diff.

> Have you looked at the sourcecode of it? If you can go through that code

> without getting headaches and the urge to vomit you can use it - I
> couldn't.
No, I've never seen GNU diff's source. But if it's anything like some
other GNU programs I've seen, I understand completely.
Meld is the only program I've used to pinpoint differences within a line.
It's also the most usable diff/merge utility I've used. Although I think
there are still some things it lacks or can improve.

Regards,
Nick G.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 21:13:43 2004