diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-07 14:42:01 -0800 |
| commit | eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e (patch) | |
| tree | 81891c565f5c6d859225acafc807f8bf7eff5a7c | |
| parent | Merge branch 'jk/mergetool' (diff) | |
| parent | mergetools: teach tortoisemerge to handle filenames with SP correctly (diff) | |
| download | tgif-eeaf4e7c32f09ef9daa45f9d5ff4713aad9b7d8e.tar.xz | |
Merge branch 'ss/mergetools-tortoise'
Update mergetools to work better with newer merge helper tortoise ships.
* ss/mergetools-tortoise:
mergetools: teach tortoisemerge to handle filenames with SP correctly
mergetools: support TortoiseGitMerge
| -rw-r--r-- | mergetools/tortoisemerge | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index ed7db495ed..3b89f1c82d 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -6,12 +6,29 @@ merge_cmd () { if $base_present then touch "$BACKUP" - "$merge_tool_path" \ - -base:"$BASE" -mine:"$LOCAL" \ - -theirs:"$REMOTE" -merged:"$MERGED" + basename="$(basename "$merge_tool_path" .exe)" + if test "$basename" = "tortoisegitmerge" + then + "$merge_tool_path" \ + -base "$BASE" -mine "$LOCAL" \ + -theirs "$REMOTE" -merged "$MERGED" + else + "$merge_tool_path" \ + -base:"$BASE" -mine:"$LOCAL" \ + -theirs:"$REMOTE" -merged:"$MERGED" + fi 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 +} |