Show More
@@ -12,6 +12,7 b' from mercurial import (' | |||||
12 | context, |
|
12 | context, | |
13 | error, |
|
13 | error, | |
14 | fancyopts, |
|
14 | fancyopts, | |
|
15 | pycompat, | |||
15 | simplemerge, |
|
16 | simplemerge, | |
16 | ui as uimod, |
|
17 | ui as uimod, | |
17 | ) |
|
18 | ) | |
@@ -71,7 +72,7 b' try:' | |||||
71 | context.arbitraryfilectx(local), |
|
72 | context.arbitraryfilectx(local), | |
72 | context.arbitraryfilectx(base), |
|
73 | context.arbitraryfilectx(base), | |
73 | context.arbitraryfilectx(other), |
|
74 | context.arbitraryfilectx(other), | |
74 | **opts)) |
|
75 | **pycompat.strkwargs(opts))) | |
75 | except ParseError as e: |
|
76 | except ParseError as e: | |
76 | sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e)) |
|
77 | sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e)) | |
77 | showhelp() |
|
78 | showhelp() |
General Comments 0
You need to be logged in to leave comments.
Login now