# HG changeset patch
# User mpm@selenic.com
# Date 2005-05-27 02:20:24
# Node ID 75dddd697ed4b89e4161996b0c75ff3c5dfd0125
# Parent  e6c621a825f2c234cc25266233289701152a58a8

trivial tweak to merge3



diff --git a/mercurial/hg.py b/mercurial/hg.py
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -808,7 +808,7 @@ class localrepository:
             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):