Merge branch 'bw/rebase-autostash-keep-current-branch'

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 84d6cc021c51ac53b68a8b9fdbdd3ed0f8d9d30a..46af3e60b7185b2767accbee3420903edaf53d6f 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -71,7 +71,7 @@ then
        then
                merge_tool="$GIT_DIFF_TOOL"
        else
-               merge_tool="$(get_merge_tool)" || exit
+               merge_tool="$(get_merge_tool)"
        fi
 fi
 
@@ -86,6 +86,13 @@ else
        do
                launch_merge_tool "$1" "$2" "$5"
                status=$?
+               if test $status -ge 126
+               then
+                       # Command not found (127), not executable (126) or
+                       # exited via a signal (>= 128).
+                       exit $status
+               fi
+
                if test "$status" != 0 &&
                        test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
                then