diff --git a/mercurial/commands.py b/mercurial/commands.py
index 0c407790593291e8dddf4f7d226b2edf808981e6_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..6062593d8b06aaacd6e5e9eb9e84acff69ba038b_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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)
diff --git a/tests/test-histedit-non-commute-abort.t b/tests/test-histedit-non-commute-abort.t
index 0c407790593291e8dddf4f7d226b2edf808981e6_dGVzdHMvdGVzdC1oaXN0ZWRpdC1ub24tY29tbXV0ZS1hYm9ydC50..6062593d8b06aaacd6e5e9eb9e84acff69ba038b_dGVzdHMvdGVzdC1oaXN0ZWRpdC1ub24tY29tbXV0ZS1hYm9ydC50 100644
--- a/tests/test-histedit-non-commute-abort.t
+++ b/tests/test-histedit-non-commute-abort.t
@@ -85,8 +85,6 @@
 
 log after abort
   $ hg resolve -l
-  abort: resolve command not applicable when not merging
-  [255]
   $ hg log --graph
   @  changeset:   6:bfa474341cc9
   |  tag:         tip
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
index 0c407790593291e8dddf4f7d226b2edf808981e6_dGVzdHMvdGVzdC1yZXNvbHZlLnQ=..6062593d8b06aaacd6e5e9eb9e84acff69ba038b_dGVzdHMvdGVzdC1yZXNvbHZlLnQ= 100644
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -42,6 +42,6 @@
   no more unresolved files
   $ hg commit -m 'resolved'
 
-resolve -l should error since no merge in progress
+resolve -l should be empty
 
   $ hg resolve -l
@@ -46,5 +46,8 @@
 
   $ hg resolve -l
+
+resolve -m should abort since no merge in progress
+  $ hg resolve -m
   abort: resolve command not applicable when not merging
   [255]
 
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
index 0c407790593291e8dddf4f7d226b2edf808981e6_dGVzdHMvdGVzdC1zaGVsdmUudA==..6062593d8b06aaacd6e5e9eb9e84acff69ba038b_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -262,8 +262,6 @@
   summary:     second
   
   $ hg resolve -l
-  abort: resolve command not applicable when not merging
-  [255]
   $ hg status
   A foo/foo
   ? a/a.orig