diff -r 042d95beeee8 -r 18af6ebd4001 mercurial/commands.py
--- a/mercurial/commands.py	Mon Feb 09 11:02:45 2015 -0800
+++ b/mercurial/commands.py	Wed Feb 11 13:47:43 2015 +0900
@@ -5328,7 +5328,7 @@
 
         ms.commit()
 
-        if not didwork and pats:
+        if not didwork and pats and not show:
             ui.warn(_("arguments do not match paths that need resolving\n"))
 
     finally: