# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1393693779 -3600
# Node ID b96cb15ec9e04d8ac5ee08b34fcbbe4200588965
# Parent  ba619c50a355c3946cdb07add520ff260034549d
merge: audit the right destination file when merging with dir rename

diff -r ba619c50a355 -r b96cb15ec9e0 mercurial/merge.py
--- a/mercurial/merge.py	Tue Feb 25 18:45:01 2014 -0800
+++ b/mercurial/merge.py	Sat Mar 01 18:09:39 2014 +0100
@@ -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: