# HG changeset patch
# User mpm@selenic.com
# Date 1117160424 28800
# Node ID 75dddd697ed4b89e4161996b0c75ff3c5dfd0125
# Parent  e6c621a825f2c234cc25266233289701152a58a8
trivial tweak to merge3



diff -r e6c621a825f2 -r 75dddd697ed4 mercurial/hg.py
--- 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):