contrib/simplemerge
changeset 30559 d83ca854fa21
parent 28047 863075fd4cd0
child 30576 541949a10a68
--- a/contrib/simplemerge	Wed Nov 30 19:23:04 2016 +0000
+++ b/contrib/simplemerge	Sat Oct 22 14:35:10 2016 +0900
@@ -54,7 +54,7 @@
         sys.exit(0)
     if len(args) != 3:
             raise ParseError(_('wrong number of arguments'))
-    sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts))
+    sys.exit(simplemerge.simplemerge(ui.ui.load(), *args, **opts))
 except ParseError as e:
     sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
     showhelp()