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

[TSVN] TortoiseMerge: Editing conflicts

From: Dave Eccleston <deccles_at_mitre.org>
Date: 2004-09-22 19:44:43 CEST

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.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Sep 22 20:45:58 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.