Fix off-by-one error in git-merge

diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py
index e4c6fe3c61ba3a02045bb7efe0f1f482c7a393d1..27b84867b03f20a1b284e177df8fc95c72a4033e 100755 (executable)
--- a/git-merge-fredrik.py
+++ b/git-merge-fredrik.py
@@ -392,6 +392,9 @@ def usage():
 # This strategy module figures out merge bases itself, so we only
 # get heads.
 
+if len(sys.argv) < 4:
+    usage()
+
 for nextArg in xrange(1, len(sys.argv)):
     if sys.argv[nextArg] == '--':
         if len(sys.argv) != nextArg + 3: