Re: merge-docx.js doesn't start up Word 2007
From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 21 Nov 2008 22:17:15 +0100
Because doing diffs/resolving-conflicts on local files is something
> I wouldn't expect Tortoise to resolve the conflicts itself (because
-- ___ 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.