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