comparison mercurial/pvec.py @ 35284:1b03407e808d

merge: skip subrepo state, update hooks, and updating the dirstate in IMM Differential Revision: https://phab.mercurial-scm.org/D1215
author Phil Cohen <phillco@fb.com>
date Fri, 01 Dec 2017 00:07:23 -0800
parents 4462a981e8df
children e7aa113b14f7
comparison
equal deleted inserted replaced
35283:46510597d266 35284:1b03407e808d