| 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 
Erik wrote:
 Because doing diffs/resolving-conflicts on local files is something
 > I wouldn't expect Tortoise to resolve the conflicts itself (because
 See above.
 Stefan
 
-- 
       ___
  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.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.