Add test-script for git-merge porcelain

diff --git a/git-merge-ours.sh b/git-merge-ours.sh
index 2b6a5c0d104b09b2eb471be9ec86e215ac003b0a..c81a790aa60ea08144dd0899d1aee2ec334a1825 100755 (executable)
--- 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