Merge remote branch 'sole/master'

This commit is contained in:
Mr.doob
2010-11-30 17:44:19 +00:00
+6
View File
@@ -9,6 +9,7 @@ except ImportError:
import os
import tempfile
import sys
def merge(files):
@@ -398,6 +399,11 @@ def parse_args():
args, remainder = parser.parse_args()
# If no arguments have been passed, show the help message and exit
if len(sys.argv) == 1:
parser.print_help()
sys.exit(1)
return args