--- a/mercurial/commands.py	Sun May 25 13:47:42 2014 +0200
+++ b/mercurial/commands.py	Fri May 23 13:10:31 2014 -0700
@@ -4922,7 +4922,7 @@
 
     ms = mergemod.mergestate(repo)
 
-    if not ms.active():
+    if not ms.active() and not show:
         raise util.Abort(_('resolve command not applicable when not merging'))
 
     m = scmutil.match(repo[None], pats, opts)