Ignore hg.update state-leave events with merge = True for purposes of mergebase chang...
commit1a26c0ad3b4d0695db84903bf776ea2da4c67408
authorKasper Kopec <kasper@fb.com>
Fri, 28 Sep 2018 22:28:27 +0000 (28 15:28 -0700)
committerHhvm Bot <hhvm-bot@users.noreply.github.com>
Fri, 28 Sep 2018 22:45:48 +0000 (28 15:45 -0700)
treefd670afe328db6f53a65486ffd5a957ed539013e
parentb692bd0495b14d86eedd735723ae7312fd3d5575
Ignore hg.update state-leave events with merge = True for purposes of mergebase changes tracking

Reviewed By: ljw1004

Differential Revision: D10075309

fbshipit-source-id: 7e396d026c5e06ef1453805af9f2aac1b020e3e1
hphp/hack/src/server/serverRevisionTracker.ml
hphp/hack/src/watchman/watchman_utils.ml