diff -r 69b60edfd76c -r f2295a829f47 mercurial/merge.py
--- a/mercurial/merge.py	Sat May 21 23:13:59 2011 +0200
+++ b/mercurial/merge.py	Sat May 21 23:21:12 2011 +0200
@@ -373,6 +373,7 @@
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
+            repo.wopener.audit(f)
             util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
     ms.commit()
     u.progress(_('updating'), None, total=numupdates, unit=_('files'))