X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge-ours.sh;h=c81a790aa60ea08144dd0899d1aee2ec334a1825;hb=be6042cfa59358b733b6f9ba05bcbc317998d9fe;hp=2b6a5c0d104b09b2eb471be9ec86e215ac003b0a;hpb=e94b4d2f2a3a9b2aaaac15c33d5d31f76531ecbf;p=git.git

diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index 2b6a5c0d1..c81a790aa 100755
--- a/git-merge-ours.sh
+++ b/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