Merge branch 'ab/pager-exit-log'

[thirdparty/git.git] / git-difftool--helper.sh

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 46af3e60b7185b2767accbee3420903edaf53d6f..992124cc67ce579e89ae86e4cca42ba2c80ea1ea 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -61,6 +61,9 @@ launch_merge_tool () {
                export BASE
                eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
        else
+               initialize_merge_tool "$merge_tool"
+               # ignore the error from the above --- run_merge_tool
+               # will diagnose unusable tool by itself
                run_merge_tool "$merge_tool"
        fi
 }
@@ -79,6 +82,9 @@ if test -n "$GIT_DIFFTOOL_DIRDIFF"
 then
        LOCAL="$1"
        REMOTE="$2"
+       initialize_merge_tool "$merge_tool"
+       # ignore the error from the above --- run_merge_tool
+       # will diagnose unusable tool by itself
        run_merge_tool "$merge_tool" false
 else
        # Launch the merge tool on each path provided by 'git diff'