提交 b21ced85 编写于 作者: M Mr.doob

Merge remote branch 'sole/master'

...@@ -9,6 +9,7 @@ except ImportError: ...@@ -9,6 +9,7 @@ except ImportError:
import os import os
import tempfile import tempfile
import sys
def merge(files): def merge(files):
...@@ -398,6 +399,11 @@ def parse_args(): ...@@ -398,6 +399,11 @@ def parse_args():
args, remainder = parser.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 return args
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册