--- a/mercurial/cmdutil.py	Tue Nov 18 21:49:05 2014 -0800
+++ b/mercurial/cmdutil.py	Tue Nov 18 22:13:05 2014 -0800
@@ -1093,7 +1093,7 @@
         if matchfn:
             stat = self.diffopts.get('stat')
             diff = self.diffopts.get('patch')
-            diffopts = patch.diffopts(self.ui, self.diffopts)
+            diffopts = patch.difffeatureopts(self.ui, self.diffopts, git=True)
             node, prev = ctx.node(), ctx.p1().node()
             if stat:
                 self.ui.pushbuffer()