--- a/mercurial/state.py Wed Jun 26 22:15:07 2019 +0530
+++ b/mercurial/state.py Sun Jun 30 01:07:14 2019 +0530
@@ -205,13 +205,6 @@
'To mark the changeset bad: hg bisect --bad\n'
'To abort: hg bisect --reset\n')
)
-addunfinished(
- 'merge', fname=None, clearable=True, allowcommit=True,
- cmdmsg=_('outstanding uncommitted merge'),
- statushint=_('To continue: hg commit\n'
- 'To abort: hg merge --abort'),
- cmdhint=_("use 'hg commit' or 'hg merge --abort'")
-)
def getrepostate(repo):
# experimental config: commands.status.skipstates