equal
deleted
inserted
replaced
52 if opts['help']: |
52 if opts['help']: |
53 showhelp() |
53 showhelp() |
54 sys.exit(0) |
54 sys.exit(0) |
55 if len(args) != 3: |
55 if len(args) != 3: |
56 raise ParseError(_('wrong number of arguments')) |
56 raise ParseError(_('wrong number of arguments')) |
57 sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts)) |
57 sys.exit(simplemerge.simplemerge(ui.ui.load(), *args, **opts)) |
58 except ParseError as e: |
58 except ParseError as e: |
59 sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) |
59 sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) |
60 showhelp() |
60 showhelp() |
61 sys.exit(1) |
61 sys.exit(1) |
62 except error.Abort as e: |
62 except error.Abort as e: |