diff -r a8b4541bb961 -r 191a0ae37767 mercurial/commands.py
--- a/mercurial/commands.py	Sat Feb 15 19:52:36 2014 +0900
+++ b/mercurial/commands.py	Sat Feb 15 19:54:05 2014 +0900
@@ -3343,7 +3343,6 @@
         rev = ctx.rev()
         datefunc = ui.quiet and util.shortdate or util.datestr
         found = False
-        filerevmatches = {}
         @util.cachefunc
         def binary():
             flog = getfile(fn)
@@ -3366,10 +3365,8 @@
             if opts.get('date'):
                 cols.append((datefunc(ctx.date()), 'grep.date'))
             if opts.get('files_with_matches'):
-                c = (fn, rev)
-                if c in filerevmatches:
+                if found:
                     continue
-                filerevmatches[c] = 1
             else:
                 before = l.line[:l.colstart]
                 match = l.line[l.colstart:l.colend]