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