--- a/mercurial/commands.py	Thu Apr 09 16:18:38 2015 -0400
+++ b/mercurial/commands.py	Sat Apr 11 12:26:54 2015 -0400
@@ -5514,7 +5514,7 @@
 
     ctx = scmutil.revsingle(repo, opts.get('rev'))
 
-    if not pats and not opts.get('all'):
+    if not pats and not (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,"