--- a/mercurial/ui.py	Tue Apr 03 22:58:33 2018 +0900
+++ b/mercurial/ui.py	Wed May 09 13:46:31 2018 -0700
@@ -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