X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-ours.sh;h=c81a790aa60ea08144dd0899d1aee2ec334a1825;hb=fed1b5cac0cc3ae324dc004181a276ea16589951;hp=4f3d053889de4a5ba8e6e5d519c014a51220accd;hpb=b4a081b428c607f98c5d0a0eec8d543dc1f2abcd;p=git.git

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