Merge branch 'sv/doc-stripspace'

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index aca0413c2840a3097056d6d247aad9438451249e..2b11b1d6fe33cf3f61dd35b8f48d6953f7a25bff 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -85,6 +85,14 @@ else
        while test $# -gt 6
        do
                launch_merge_tool "$1" "$2" "$5"
+               status=$?
+               if test "$status" != 0 &&
+                       test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
+               then
+                       exit $status
+               fi
                shift 7
        done
 fi
+
+exit 0