Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 6040:1d0bfa4c75c0
commands.py, patch.py: add -U option to hg diff command
author | jorendorff@mozilla.com |
---|---|
date | Thu, 26 Jul 2007 07:56:04 -0400 |
parents | cf67b5f3743d |
children | 2da5b19a6460 |
comparison
equal
deleted
inserted
replaced
4998:81f8ff2a9bf2 | 6040:1d0bfa4c75c0 |
---|---|
2914 _('ignore white space when comparing lines')), | 2914 _('ignore white space when comparing lines')), |
2915 ('b', 'ignore-space-change', None, | 2915 ('b', 'ignore-space-change', None, |
2916 _('ignore changes in the amount of white space')), | 2916 _('ignore changes in the amount of white space')), |
2917 ('B', 'ignore-blank-lines', None, | 2917 ('B', 'ignore-blank-lines', None, |
2918 _('ignore changes whose lines are all blank')), | 2918 _('ignore changes whose lines are all blank')), |
2919 ('U', 'unified', 3, | |
2920 _('number of lines of context to show')) | |
2919 ] + walkopts, | 2921 ] + walkopts, |
2920 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), | 2922 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), |
2921 "^export": | 2923 "^export": |
2922 (export, | 2924 (export, |
2923 [('o', 'output', '', _('print output to file with formatted name')), | 2925 [('o', 'output', '', _('print output to file with formatted name')), |