Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 20620:bedb9f1a6b4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Augie Fackler <raf@durin42.com>
date Sat, 01 Mar 2014 21:08:28 -0500
parents abd448767465 b96cb15ec9e0
children 1df033640a8e
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Feb 03 02:09:46 2014 -0500
+++ b/mercurial/merge.py	Sat Mar 01 21:08:28 2014 -0500
@@ -654,7 +654,7 @@
             f2, fd, flags = args
             if f:
                 repo.ui.note(_("moving %s to %s\n") % (f, fd))
-                audit(f)
+                audit(fd)
                 repo.wwrite(fd, wctx.filectx(f).data(), flags)
                 util.unlinkpath(repo.wjoin(f))
             if f2: