Commit Graph

2 Commits

Author SHA1 Message Date
Phil Cohen
407941c6f3 conflictinfo: fix hg treating an interupted unshelve as a merge
Summary: Fixes T25823569. We need to check for mergestate last since some commands leave that file in addition to their own.

Reviewed By: DurhamG

Differential Revision: D7013846

fbshipit-source-id: 42730bbee81b4c3b3aa2280a48d57da703fab5dd
2018-04-13 21:51:13 -07:00
Kostia Balytskyi
e75b9fc1b1 fb-hgext: move most of hgext3rd and related tests to core
Summary:
This commit moves most of the stuff in hgext3rd and related tests to
hg-crew/hgext and hg-crew/test respectively.

The things that are not moved are the ones which require some more complex
imports.


Depends on D6675309

Test Plan: - tests are failing at this commit, fixes are in the following commits

Reviewers: #sourcecontrol

Differential Revision: https://phabricator.intern.facebook.com/D6675329
2018-01-09 03:03:59 -08:00