Mercurial > hg-stable

diff mercurial/hg.py @ 171:75dddd697ed4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trivial tweak to merge3
author mpm@selenic.com
date Thu, 26 May 2005 18:20:24 -0800
parents f38c90953c2c
children 1d8e9637a0a4
line wrap: on
line diff
--- 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):