Changeset 3c33ba2fc76d…
Parent 39fa855da206…
by
Changes to one file · Browse files at 3c33ba2fc76d Showing diff from parent 39fa855da206 Diff from another changeset...
@@ -278,7 +278,7 @@ from hggtk.history import run
gtkrun(run(ui, *pats, **opts))
-def merge(ui, node=None, rev=None, **opts):
+def merge(ui, *pats, **opts):
"""merge tool"""
from hggtk.merge import run
gtkrun(run(ui, *pats, **opts))
|
Loading...