changeset 44235 | ff22c76825b9 |
parent 44092 | 833210fbd900 |
child 44236 | d1c0f239193f |
--- a/mercurial/merge.py Thu Jan 23 13:10:48 2020 -0800 +++ b/mercurial/merge.py Wed Jan 15 15:07:43 2020 -0800 @@ -2574,7 +2574,7 @@ if not branchmerge: sparse.prunetemporaryincludes(repo) - if not partial: + if updatedirstate: repo.hook( b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount )