Merge branch 'fr_review' of git://github.com/jnavila/git

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

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 7bfb6737dfe7be46f3f29903bef844c3c2b1be11..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