--- a/mercurial/patch.py	Tue Nov 18 16:53:22 2014 -0800
+++ b/mercurial/patch.py	Tue Nov 18 21:43:38 2014 -0800
@@ -1558,10 +1558,12 @@
 class GitDiffRequired(Exception):
     pass
 
-def diffopts(ui, opts=None, untrusted=False, section='diff'):
+def diffallopts(ui, opts=None, untrusted=False, section='diff'):
     '''return diffopts with all features supported and parsed'''
     return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section)
 
+diffopts = diffallopts
+
 def difffeatureopts(ui, opts=None, untrusted=False, section='diff'):
     '''return diffopts with only opted-in features parsed'''
     def get(key, name=None, getter=ui.configbool, forceplain=None):