[TSVN] TortoiseMerge: Editing conflicts

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.

Thanks,
Dave

---------------------------------------------------------------------
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