changeset 14405 | f2295a829f47 |
parent 14398 | ae1f7a5373e8 |
child 14406 | c97c10a1b4bc |
--- 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'))