diff mercurial/commands.py @ 6468:af2edc9c5bb9

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Fri, 04 Apr 2008 22:18:38 +0200
parents cd3d49ffc6f6 65029a3aafc2
children fb502719c75c
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Apr 03 13:47:05 2008 +0200
+++ b/mercurial/commands.py	Fri Apr 04 22:18:38 2008 +0200
@@ -3037,7 +3037,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]...')),