X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-ours.sh;h=c81a790aa60ea08144dd0899d1aee2ec334a1825;hb=4e560158c6de154fafab9fc3f6028d9edcc53e6b;hp=2b6a5c0d104b09b2eb471be9ec86e215ac003b0a;hpb=5f5dbd719d0d8ec136f32a0a56674902bd85f72f;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