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

[PATCH] Make TortoiseMerge accept two file names

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-07-25 12:59:46 CEST

Hi Stefan,

I would like to commit the attached patch but before that I'd like you to
review the change.

I would like to be able to call TortoiseMerge with two file names as
parameters to be able to use TortoiseMerge as a Diff-Tool for another
application: "TortoiseMerge.exe file1.txt file2.txt"
This is the same syntax which CAppUtils::StartExtDiff uses if %base
and %mine are not set.

Currently TortoiseMerge expects the file names to be prefixed with /base:
and /mine:.

Do you have any concerns about this change? Should we also support three
parameters to optionaly set %theirs?

Tobias

-- 
       ___
  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 Tue Jul 25 13:00:44 2006

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