diff -r 9926aab3d0b5 -r a84698badf0b mercurial/patch.py
--- a/mercurial/patch.py	Sun Nov 20 19:14:36 2011 +0100
+++ b/mercurial/patch.py	Fri Nov 18 12:04:31 2011 +0100
@@ -1527,10 +1527,10 @@
 class GitDiffRequired(Exception):
     pass
 
-def diffopts(ui, opts=None, untrusted=False):
+def diffopts(ui, opts=None, untrusted=False, section='diff'):
     def get(key, name=None, getter=ui.configbool):
         return ((opts and opts.get(key)) or
-                getter('diff', name or key, None, untrusted=untrusted))
+                getter(section, name or key, None, untrusted=untrusted))
     return mdiff.diffopts(
         text=opts and opts.get('text'),
         git=get('git'),