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

RE: [TSVN] Re: TortoiseMerge: Editing conflicts

From: Timothy B K. Kientzle <tkientzle_at_zinio.com>
Date: 2004-09-24 17:51:41 CEST

"Dave Eccleston" wrote
> I absolutely love the three-panel view for resolving conflicts in
> TortoiseSVN. However, sometimes it is not appropriate to pick theirs
or
> yours, but you want a combination of both. It would be nice if
> TortoiseMerge would allow a user to enter arbitrary text as the result
> of conflict resolution.

Using TortoiseMerge, I've been missing
a feature of Emacs Ediff system, which
highlights the differences within each
line (it helps to know what few words are
really different on two varying lines).

Tim

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Sep 24 18:57:06 2004

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