On Mon, 14 Jan 2013, Warden, Neil wrote:
From: Warren Block [mailto:wbl...@wonkity.com]
Sent: Samstag, 12. Januar 2013 21:24
To: users@subversion.apache.org
Subject: external merge tools for conflicts only
Is there any way to get svn to use an external merge tool, but only
for conflicts?
In
Hi Warren,
possibly not the answer you are looking for, but hav you tried
http://kdiff3.sourceforge.net/ as merge tool? In case of conflicts it resolves
everything it can do automatically and only non-automatically resolved merge
conflicts left over for manual resolution.
Cheers
Neil
-Ori
