diff-format.txt: Combined diff format documentation supplement

diff --git a/git-merge.sh b/git-merge.sh
index 5b34b4de99c33a99dfb841795baced8889f74a88..789f4de595d2657c9c348b4d52b47e2c42543ad2 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -93,6 +93,8 @@ finish () {
        esac
 }
 
+case "$#" in 0) usage ;; esac
+
 rloga=
 while case "$#" in 0) break ;; esac
 do