--- a/mercurial/commands.py	Tue Apr 21 16:20:43 2015 -0700
+++ b/mercurial/commands.py	Wed Apr 22 16:38:36 2015 -0700
@@ -5511,7 +5511,8 @@
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
 
-    if not pats and not (opts.get('all') or opts.get('interactive')):
+    if (not (pats or opts.get('include') or opts.get('exclude') or
+             opts.get('all') or opts.get('interactive'))):
         msg = _("no files or directories specified")
         if p2 != nullid:
             hint = _("uncommitted merge, use --all to discard all changes,"