##// END OF EJS Templates
merge: don't call update hook when using in-memory context...
Martin von Zweigbergk -
r44611:ff22c768 default
parent child Browse files
Show More
@@ -2574,7 +2574,7 b' def update('
2574 2574 if not branchmerge:
2575 2575 sparse.prunetemporaryincludes(repo)
2576 2576
2577 if not partial:
2577 if updatedirstate:
2578 2578 repo.hook(
2579 2579 b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount
2580 2580 )
General Comments 0
You need to be logged in to leave comments. Login now