diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1195,8 +1195,7 @@ def recordupdates(repo, actions, branchm # re-add for f, args, msg in actions.get('a', []): - if not branchmerge: - repo.dirstate.add(f) + repo.dirstate.add(f) # re-add/mark as modified for f, args, msg in actions.get('am', []):