diff options
| author | Sven Strickroth <sven.strickroth@tu-clausthal.de> | 2013-01-26 01:15:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-27 03:01:46 (GMT) |
| commit | 8bf671946da23b39b7b6b18fe99cfa011ec21a11 (patch) | |
| tree | c76837ccc67e71260cc621e6776bdcff9b512a14 /mergetools/tortoisemerge | |
| parent | 5d417842efeafb6e109db7574196901c4e95d273 (diff) | |
| download | git-8bf671946da23b39b7b6b18fe99cfa011ec21a11.zip git-8bf671946da23b39b7b6b18fe99cfa011ec21a11.tar.gz git-8bf671946da23b39b7b6b18fe99cfa011ec21a11.tar.bz2 | |
mergetools: support TortoiseGitMerge
TortoiseMerge.exe was ben renamed to TortoiseGitMerge.exe (starting
with 1.8.0) in order to make it clear that it has special support
for git, and prevent confusion with the TortoiseSVN TortoiseMerge
version.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
| -rw-r--r-- | mergetools/tortoisemerge | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index ed7db49..8476afa 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -11,7 +11,16 @@ merge_cmd () { -theirs:"$REMOTE" -merged:"$MERGED" check_unchanged else - echo "TortoiseMerge cannot be used without a base" 1>&2 + echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } + +translate_merge_tool_path() { + if type tortoisegitmerge >/dev/null 2>/dev/null + then + echo tortoisegitmerge + else + echo tortoisemerge + fi +} |