X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fexamples%2Fgit-merge-ours.sh;h=29dba4ba3a57c15bd430bd23c1cebe78e6dc03be;hb=8102453318caf731ec0fdfa8d9f744a0ac9a44ef;hp=c81a790aa60ea08144dd0899d1aee2ec334a1825;hpb=faf8280850e9af4ef63decd8d4e65a7609544c21;p=git.git

diff --git a/contrib/examples/git-merge-ours.sh b/contrib/examples/git-merge-ours.sh
index c81a790aa..29dba4ba3 100755
--- a/contrib/examples/git-merge-ours.sh
+++ b/contrib/examples/git-merge-ours.sh
@@ -9,6 +9,6 @@
 # because the current index is what we will be committing as the
 # merge result.
 
-git diff-index --quiet --cached HEAD || exit 2
+git diff-index --quiet --cached HEAD -- || exit 2
 
 exit 0