diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index a64704f3e52be43b427792ef9c1bbe42af057c87..2b6a5c0d104b09b2eb471be9ec86e215ac003b0a 100755 (executable)
--- a/git-merge-ours.sh
+++ b/git-merge-ours.sh
#
# 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.
+
+git-diff-index --quiet --cached HEAD || exit 2
+
exit 0