X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-one-file.sh;h=d067894bf45fd0a50513e196ea2a5e671d901681;hb=08641d022d48401568db2123f689498b5631be2e;hp=9c2c1b7202462370509a7bdb391982ae32564bd6;hpb=011c181cc656c8b3e48882729d1b6238e8c5c537;p=git.git

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 9c2c1b720..d067894bf 100755
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -16,6 +16,18 @@
 # been handled already by git read-tree, but that one doesn't
 # do any merges that might change the tree layout.
 
+USAGE='<orig blob> <our blob> <their blob> <path>'
+USAGE="$USAGE <orig mode> <our mode> <their mode>"
+LONG_USAGE="Usage: git merge-one-file $USAGE
+
+Blob ids and modes should be empty for missing files."
+
+if ! test "$#" -eq 7
+then
+	echo "$LONG_USAGE"
+	exit 1
+fi
+
 case "${1:-.}${2:-.}${3:-.}" in
 #
 # Deleted in both or deleted in one and unchanged in the other