Merge branch 'jg/prompt-localize-temporary'

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d4fb6dfe138fffd4d000c7d5aeb7787bea9970f4..2b11b1d6fe33cf3f61dd35b8f48d6953f7a25bff 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -94,3 +94,5 @@ else
                shift 7
        done
 fi
+
+exit 0