X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-ours.sh;h=2b6a5c0d104b09b2eb471be9ec86e215ac003b0a;hb=5f5dbd719d0d8ec136f32a0a56674902bd85f72f;hp=4f3d053889de4a5ba8e6e5d519c014a51220accd;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index 4f3d05388..2b6a5c0d1 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.
 
-test "$(git-diff-index --cached --name-status HEAD)" = "" || exit 2
+git-diff-index --quiet --cached HEAD || exit 2
 
 exit 0