Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trivial tweak to merge3
authormpm@selenic.com
Thu, 26 May 2005 18:20:24 -0800
changeset 171 75dddd697ed4
parent 170 e6c621a825f2
child 172 e9b1147db448
trivial tweak to merge3
mercurial/hg.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hg.py	Thu May 26 13:02:28 2005 -0800
+++ b/mercurial/hg.py	Thu May 26 18:20:24 2005 -0800
@@ -808,7 +808,7 @@
             os.unlink(b)
             os.unlink(c)
             
-        return fl.addrevision(text, transaction, link, my, other)
+        return fl.add(text, transaction, link, my, other)
 
 class remoterepository:
     def __init__(self, ui, path):
Mercurial