Merge branch 'ar/diff'

[git.git] / git-merge-ours.sh

diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index a64704f3e52be43b427792ef9c1bbe42af057c87..4f3d053889de4a5ba8e6e5d519c014a51220accd 100755 (executable)
--- a/git-merge-ours.sh
+++ b/git-merge-ours.sh
@@ -4,4 +4,11 @@
 #
 # Pretend we resolved the heads, but declare our tree trumps everybody else.
 #
+
+# We need to exit with 2 if the index does not match our HEAD tree,
+# because the current index is what we will be committing as the
+# merge result.
+
+test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+
 exit 0