diff mercurial/commands.py @ 6467:65029a3aafc2

Let --unified default to diff.unified (issue 1076)
author Patrick Mezard <pmezard@gmail.com>
date Fri, 04 Apr 2008 22:15:14 +0200
parents a60b711c7ac4
children af2edc9c5bb9 4f3e0dfa24a9
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Apr 03 13:14:43 2008 +0200
+++ b/mercurial/commands.py	Fri Apr 04 22:15:14 2008 +0200
@@ -3028,7 +3028,7 @@
            _('ignore changes in the amount of white space')),
           ('B', 'ignore-blank-lines', None,
            _('ignore changes whose lines are all blank')),
-          ('U', 'unified', 3,
+          ('U', 'unified', '',
            _('number of lines of context to show'))
          ] + walkopts,
          _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')),