equal
deleted
inserted
replaced
26 _(b'print results instead of overwriting LOCAL')), |
26 _(b'print results instead of overwriting LOCAL')), |
27 (b'', b'no-minimal', None, _(b'no effect (DEPRECATED)')), |
27 (b'', b'no-minimal', None, _(b'no effect (DEPRECATED)')), |
28 (b'h', b'help', None, _(b'display help and exit')), |
28 (b'h', b'help', None, _(b'display help and exit')), |
29 (b'q', b'quiet', None, _(b'suppress output'))] |
29 (b'q', b'quiet', None, _(b'suppress output'))] |
30 |
30 |
31 usage = _('''simplemerge [OPTS] LOCAL BASE OTHER |
31 usage = _(b'''simplemerge [OPTS] LOCAL BASE OTHER |
32 |
32 |
33 Simple three-way file merge utility with a minimal feature set. |
33 Simple three-way file merge utility with a minimal feature set. |
34 |
34 |
35 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
35 Apply to LOCAL the changes necessary to go from BASE to OTHER. |
36 |
36 |
39 |
39 |
40 class ParseError(Exception): |
40 class ParseError(Exception): |
41 """Exception raised on errors in parsing the command line.""" |
41 """Exception raised on errors in parsing the command line.""" |
42 |
42 |
43 def showhelp(): |
43 def showhelp(): |
44 pycompat.stdout.write(usage.encode('utf8')) |
44 pycompat.stdout.write(usage) |
45 pycompat.stdout.write(b'\noptions:\n') |
45 pycompat.stdout.write(b'\noptions:\n') |
46 |
46 |
47 out_opts = [] |
47 out_opts = [] |
48 for shortopt, longopt, default, desc in options: |
48 for shortopt, longopt, default, desc in options: |
49 out_opts.append((b'%2s%s' % (shortopt and b'-%s' % shortopt, |
49 out_opts.append((b'%2s%s' % (shortopt and b'-%s' % shortopt, |