Mercurial > hg

diff mercurial/commands.py @ 23024:ec36969497de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: run happily after conflict-free merge
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 22:30:04 -0700
parents dc8803ce3dfe
children 21a55dbc3940
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Oct 08 22:16:18 2014 -0700
+++ b/mercurial/commands.py	Wed Oct 08 22:30:04 2014 -0700
@@ -5283,7 +5283,7 @@
     try:
         ms = mergemod.mergestate(repo)
 
-        if not ms.active() and not show:
+        if not (ms.active() or repo.dirstate.p2() != nullid) and not show:
             raise util.Abort(
                 _('resolve command not applicable when not merging'))