[PATCH v2] mergetool--lib: add new merge tool TortoiseMerge
From: David Aguilar <hidden>
Date: 2016-06-15 22:46:33
From: Markus Heidelberg <redacted> TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can only be used as a merge tool with an existing base file. It cannot be used without a base nor as a diff tool. The documentation only mentions the slash '/' as command line option prefix, which refused to work, but the parser also accepts the dash '-' See http://code.google.com/p/msysgit/issues/detail?id=226 Signed-off-by: Markus Heidelberg <redacted> --- This is Markus' patch rebased on top of my latest refactoring patch. It didn't apply cleanly so I figured I'd resolve the merge myself. git-mergetool--lib.sh | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index dcd4516..268485a 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh@@ -46,10 +46,13 @@ check_unchanged () { valid_tool () { case "$1" in - kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge | diffuse) + kdiff3 | kompare | tkdiff | xxdiff | meld | opendiff | emerge | vimdiff | gvimdiff | ecmerge | diffuse | tortoisemerge) if test "$1" = "kompare" && ! diff_mode; then return 1 fi + if test "$1" = "tortoisemerge" && ! merge_mode; then + return 1 + fi ;; # happy *) if test -z "$(get_merge_tool_cmd "$1")"; then
@@ -220,6 +223,16 @@ run_merge_tool () { fi status=$? ;; + tortoisemerge) + if $base_present; then + touch "$BACKUP" + "$merge_tool_path" -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED" + check_unchanged + else + echo "TortoiseMerge cannot be used without a base" 1>&2 + status=1 + fi + ;; *) if test -n "$merge_tool_cmd"; then if merge_mode &&
--
1.6.2.1.469.gdffc1