Re: [TSVN] Resolving Conflicts

Hughes, Bill wrote:
<snip>

>kdiff3 is the ugliest (IMHO) but it has the nice feature of highlighting the
>changes within a changed line.
>
<><snip>

> <>TorotiseMerge presents better then kdiff3, and I particularly like
> the two
> lines being shown at the bottom for direct comparison.

<snip>

> <>I find WinMerge best for actually working on the files (if there are
> only two), as
> Will said it's particularly good for letting you choose which file you
> want
> to pull a diff from on a diff by diff basis, and you can edit the file a
> little at the same time.

Well, I use always use the latest experimental build of WinMerge, and
some of the features you mention are included:

- specific changes within a line can be selected by pressing F4, with
the cursor on that same line
- the experimental build does show the current lines at the bottom of
the window.

I'll be the first to admit that these feature are not yet as mature as
in the other programs, but they are clearly working their way towards that.

Regards,
Arnout

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 26 13:28:42 2004