Re: [PATCH] mergetools: Enhance tortoisemerge to work with
From: Sven Strickroth <hidden>
Date: 2016-06-15 22:55:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH] mergetools: Enhance tortoisemerge to work with · Sven Strickroth <hidden>
- 2016-06-15 · Re: [PATCH] mergetools: Enhance tortoisemerge to work with · David Aguilar <hidden>
- 2016-06-15 · [PATCH] mergetools: Enhance tortoisemerge to work with · Sven Strickroth <hidden>
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. Signed-off-by: Sven Strickroth <redacted> --- mergetools/tortoisemerge | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
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 +}
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server