Skip to content
Snippets Groups Projects
Commit 168485fa authored by Thomas Arendsen Hein's avatar Thomas Arendsen Hein
Browse files

merge with upstream

parents 1e2941fd 7a0d70b6
No related branches found
No related tags found
No related merge requests found
......@@ -379,4 +379,5 @@
# update dirstate
if not partial:
recordupdates(repo, action, branchmerge)
repo.dirstate.setparents(p1.node(), p2.node())
......@@ -382,5 +383,4 @@
repo.dirstate.setparents(p1.node(), p2.node())
recordupdates(repo, action, branchmerge)
if show_stats:
stats = ((updated, _("updated")),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment