Patchwork D3516: tweakdefaults: remove "bisect" from commands.status.skipstates

login
register
mail settings
Submitter phabricator
Date May 10, 2018, 10:41 a.m.
Message ID <12bef115ccd1298e083b25303fbdc706@localhost.localdomain>
Download mbox | patch
Permalink /patch/31439/
State Not Applicable
Headers show

Comments

phabricator - May 10, 2018, 10:41 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc6904da6ab15: tweakdefaults: remove &quot;bisect&quot; from commands.status.skipstates (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3516?vs=8594&id=8597

REVISION DETAIL
  https://phab.mercurial-scm.org/D3516

AFFECTED FILES
  mercurial/ui.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel

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