From: David Aguilar <davvid@gmail.com>
Date: Fri, 21 Nov 2014 01:20:28 +0000 (-0800)
Subject: difftool--helper: add explicit exit statement
X-Git-Tag: v2.3.0-rc0~83^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c41d3fedd8a5dec2c2c991822b70b91c50ca047e;p=thirdparty%2Fgit.git

difftool--helper: add explicit exit statement

git-difftool--helper returns a zero exit status unless
--trust-exit-code is in effect.  Add an explicit exit statement
to make this clearer.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index d4fb6dfe13..2b11b1d6fe 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -94,3 +94,5 @@ else
 		shift 7
 	done
 fi
+
+exit 0