X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fexamples%2Fgit-merge-ours.sh;h=29dba4ba3a57c15bd430bd23c1cebe78e6dc03be;hb=1b8dbdb41e503f6829be4e1d8ada4c8eabbc49bd;hp=c81a790aa60ea08144dd0899d1aee2ec334a1825;hpb=6c6ea3800d1eace51994d90fbeb19ffe918e63b0;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