[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [TSVN] VBScript for comparing two MS Word documents

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-07-08 21:47:16 CEST

Mark Phippard wrote:
> I used Update to create a local conflict. Then did Edit Conflicts.

Strange. The %merge should be the path of the file you executed "Edit
conflicts" on. As done in SVN::StartConflictEditor().

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 8 21:47:38 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.