Merge git-gui into ml/git-gui-exec-path-fix

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

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 992124cc67ce579e89ae86e4cca42ba2c80ea1ea..e4e820e68095928765940be51fba0cdb8e5d609c 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -75,6 +75,11 @@ then
                merge_tool="$GIT_DIFF_TOOL"
        else
                merge_tool="$(get_merge_tool)"
+               subshell_exit_status=$?
+               if test $subshell_exit_status -gt 1
+               then
+                       exit $subshell_exit_status
+               fi
        fi
 fi