diff options
| -rwxr-xr-x | git-merge-fredrik.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-merge-fredrik.py b/git-merge-fredrik.py index e4c6fe3c61..27b84867b0 100755 --- 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: |