Re: Problem to avoid automatic merges during updates
From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 29 Oct 2008 08:36:44 +0100
Schreiner Matthias wrote:
diff-cmd is not used for merges, diff3-cmd is.
-- ___ oo // \\ "De Chelonian Mobile" (_,\/ \_/ \ TortoiseSVN \ \_/_\_/> The coolest Interface to (Sub)Version Control /_/ \_\ http://tortoisesvn.net
This is an archived mail posted to the TortoiseSVN Users mailing list.