Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib/simplemerge
changeset 33906 fa6309c5761d
parent 33903 ed6f64173121
child 34050 b4226ad98366 
--- a/contrib/simplemerge	Thu Aug 24 21:30:37 2017 -0700
+++ b/contrib/simplemerge	Thu Aug 24 21:30:51 2017 -0700
@@ -85,9 +85,6 @@
             raise ParseError(_('wrong number of arguments'))
     local, base, other = args
     sys.exit(simplemerge.simplemerge(uimod.ui.load(),
-                                     local,
-                                     base,
-                                     other,
                                      filebackedctx(local),
                                      filebackedctx(base),
                                      filebackedctx(other),
mercurial