Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 27132 baa7571f40c5
parent 27131 d837da26155e
child 27137 25e4b2f000c5 
--- a/mercurial/merge.py	Mon Nov 30 10:19:39 2015 -0800
+++ b/mercurial/merge.py	Tue Nov 24 15:26:51 2015 -0800
@@ -1195,8 +1195,7 @@
 
     # 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', []):
mercurial