diff -r 0875cda033fd -r a20a1bb0c396 mercurial/ui.py
--- a/mercurial/ui.py	Sun Jul 09 01:30:30 2006 +0200
+++ b/mercurial/ui.py	Thu Jun 29 15:16:25 2006 +0200
@@ -172,7 +172,8 @@
     def diffopts(self):
         if self.diffcache:
             return self.diffcache
-        result = {'showfunc': True, 'ignorews': False}
+        result = {'showfunc': True, 'ignorews': False,
+                  'ignorewsamount': False, 'ignoreblanklines': False}
         for key, value in self.configitems("diff"):
             if value:
                 result[key.lower()] = (value.lower() == 'true')