diff hgext/extdiff.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 a8bc191fee5a
children 33ed8b511185
line wrap: on
line diff