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

Tortoise merge - manual edits

From: Wiesel, Klaus <Klaus.Wiesel_at_infor.com>
Date: 2006-01-20 13:46:12 CET

Hi

It would be really nice to be able to edit a togh conflict by hand -
just beeing able to choose which side should win is not enough.

With manual edits there would be no need for p4merge or other external
tools any more

Regards
Klaus

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Jan 20 13:48:25 2006

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

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