Submitter | phabricator |
---|---|
Date | May 9, 2018, 9:16 p.m. |
Message ID | <differential-rev-PHID-DREV-rtxmohhdm2vchamt6cyh-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/31436/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -66,8 +66,6 @@ update.check = noconflict # Show conflicts information in `hg status` status.verbose = True -# Skip the bisect state in conflicts information in `hg status` -status.skipstates = bisect [diff] git = 1