From patchwork Fri Mar 13 21:21:25 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D8290: morestatus: recommend `hg resolve --clear` when appropriate
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 45774
Message-Id: <differential-rev-PHID-DREV-2esmxmqvz76ua7y5vjh3-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Fri, 13 Mar 2020 21:21:25 +0000

martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-update-branches.t

CHANGE DETAILS




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

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -635,6 +635,7 @@
   $ hg status
   M foo
   # No unresolved merge conflicts.
+  # Use 'hg resolve --clear' to clear the merge state.
   
   $ hg status -Tjson
   [
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -883,6 +883,10 @@
 
         else:
             msg = _(b'No unresolved merge conflicts.')
+            if not self.unfinishedop:
+                msg += _(
+                    b"\nUse 'hg resolve --clear' to clear the merge state."
+                )
 
         fm.plain(b'%s\n' % _commentlines(msg), label=self._label)