merge.recordupdates: mark 'a' files as added unconditionally

See the previous patch for why we do this.

mercurial/merge.py

@@ -1195,8 +1195,7 b' 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', []):