Re: [PATCH] mergetools: Add tortoisegitmerge helper
- From
- Sven Strickroth <sven.strickroth@tu-clausthal.de>
- Date
- Jan 24, 2013, 22:07 UTC
- Message-ID
- <5101B0A5.1020308@tu-clausthal.de>
- In-Reply-To
- <7vfw1qbbr4.fsf@alter.siamese.dyndns.org>
Am 24.01.2013 20:51 schrieb Junio C Hamano:
Show 11 quoted lines
> Sven Strickroth <sven.strickroth@tu-clausthal.de> writes: > >> - The TortoiseGit team renamed TortoiseMerge.exe to TortoiseGitMerge.exe >> (starting with 1.8.0) in order to make clear that this one has special >> support for git and prevent confusion with the TortoiseSVN TortoiseMerge >> version. > > Wouldn't it make more sense in such a situation if your users can > keep using the old "tortoisemerge" configured in their configuration > and when the renamed one is found the mergetool automatically used > it, rather than the way your patch is done?
That was also my first idea, however, TortoiseMerge uses parameters as follows: '-base:"$BASE"'. TortoiseGitMerge uses values separated by space from keys: '-base "$BASE"'. So both are incompatible (the first approach has problems with spaces in filenames, the TortoiseGitMerge approach fixes this).
Show 23 quoted lines
>> diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt >> index 4314ad0..13cbe5b 100644 >> --- a/Documentation/diff-config.txt >> +++ b/Documentation/diff-config.txt >> @@ -151,7 +151,7 @@ diff.<driver>.cachetextconv:: >> diff.tool:: >> The diff tool to be used by linkgit:git-difftool[1]. This >> option overrides `merge.tool`, and has the same valid built-in >> - values as `merge.tool` minus "tortoisemerge" and plus >> - "kompare". Any other value is treated as a custom diff tool, >> + values as `merge.tool` minus "tortoisemerge"/"tortoisegitmerge" and >> + plus "kompare". Any other value is treated as a custom diff tool, >> and there must be a corresponding `difftool.<tool>.cmd` >> option. > > So in short, two tortoises and kompare are only valid as mergetool > but cannot be used as difftool? No, I am reading it wrong. > merge.tool can be used for both, kompare can be used as difftool, > and two tortoises can only be used as mergetool. > > This paragraph needs to be rewritten to unconfuse readers. The > original is barely intelligible, and it becomes unreadable as the > set of tools subtracted by "minus" and added by "plus" grows.
But I think this should not be part of this patch.
-- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server