Show More
@@ -2916,6 +2916,8 b' table = {' | |||||
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": |
@@ -1011,7 +1011,8 b' def diffopts(ui, opts={}, untrusted=Fals' | |||||
1011 | showfunc=get('show_function', 'showfunc'), |
|
1011 | showfunc=get('show_function', 'showfunc'), | |
1012 | ignorews=get('ignore_all_space', 'ignorews'), |
|
1012 | ignorews=get('ignore_all_space', 'ignorews'), | |
1013 | ignorewsamount=get('ignore_space_change', 'ignorewsamount'), |
|
1013 | ignorewsamount=get('ignore_space_change', 'ignorewsamount'), | |
1014 |
ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines') |
|
1014 | ignoreblanklines=get('ignore_blank_lines', 'ignoreblanklines'), | |
|
1015 | context=get('unified')) | |||
1015 |
|
1016 | |||
1016 | def updatedir(ui, repo, patches): |
|
1017 | def updatedir(ui, repo, patches): | |
1017 | '''Update dirstate after patch application according to metadata''' |
|
1018 | '''Update dirstate after patch application according to metadata''' |
@@ -205,6 +205,7 b' options:' | |||||
205 | -w --ignore-all-space ignore white space when comparing lines |
|
205 | -w --ignore-all-space ignore white space when comparing lines | |
206 | -b --ignore-space-change ignore changes in the amount of white space |
|
206 | -b --ignore-space-change ignore changes in the amount of white space | |
207 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
207 | -B --ignore-blank-lines ignore changes whose lines are all blank | |
|
208 | -U --unified number of lines of context to show (default: 3) | |||
208 | -I --include include names matching the given patterns |
|
209 | -I --include include names matching the given patterns | |
209 | -X --exclude exclude names matching the given patterns |
|
210 | -X --exclude exclude names matching the given patterns | |
210 |
|
211 |
General Comments 0
You need to be logged in to leave comments.
Login now