comparison 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
comparison
equal deleted inserted replaced
6462:6c4e12682fb9 6468:af2edc9c5bb9
3035 _('ignore white space when comparing lines')), 3035 _('ignore white space when comparing lines')),
3036 ('b', 'ignore-space-change', None, 3036 ('b', 'ignore-space-change', None,
3037 _('ignore changes in the amount of white space')), 3037 _('ignore changes in the amount of white space')),
3038 ('B', 'ignore-blank-lines', None, 3038 ('B', 'ignore-blank-lines', None,
3039 _('ignore changes whose lines are all blank')), 3039 _('ignore changes whose lines are all blank')),
3040 ('U', 'unified', 3, 3040 ('U', 'unified', '',
3041 _('number of lines of context to show')) 3041 _('number of lines of context to show'))
3042 ] + walkopts, 3042 ] + walkopts,
3043 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), 3043 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3044 "^export": 3044 "^export":
3045 (export, 3045 (export,