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
-Original Message-
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 other words, if I set up an
Is there any way to get svn to use an external merge tool, but only for
conflicts?
In other words, if I set up an external merge tool like diffuse
(http://diffuse.sourceforge.net/), when svn finds a conflict it just
throws both repository and working copy files at the external merge
tool. In