Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 10520:75361931884d stable
commands: mention diff -c
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Sun, 21 Feb 2010 01:21:17 +0200 |
| parents | 98bc3e195720 |
| children | 9c0ba837dc65 |
comparison
equal
deleted
inserted
replaced
| 10519:f75db9927429 | 10520:75361931884d |
|---|---|
| 1111 When two revision arguments are given, then changes are shown | 1111 When two revision arguments are given, then changes are shown |
| 1112 between those revisions. If only one revision is specified then | 1112 between those revisions. If only one revision is specified then |
| 1113 that revision is compared to the working directory, and, when no | 1113 that revision is compared to the working directory, and, when no |
| 1114 revisions are specified, the working directory files are compared | 1114 revisions are specified, the working directory files are compared |
| 1115 to its parent. | 1115 to its parent. |
| 1116 | |
| 1117 Alternatively you can specify -c/--change with a revision to use | |
| 1118 as a baseline. | |
| 1116 | 1119 |
| 1117 Without the -a/--text option, diff will avoid generating diffs of | 1120 Without the -a/--text option, diff will avoid generating diffs of |
| 1118 files it detects as binary. With -a, diff will generate a diff | 1121 files it detects as binary. With -a, diff will generate a diff |
| 1119 anyway, probably with undesirable results. | 1122 anyway, probably with undesirable results. |
| 1120 | 1123 |
| 3550 "^diff": | 3553 "^diff": |
| 3551 (diff, | 3554 (diff, |
| 3552 [('r', 'rev', [], _('revision')), | 3555 [('r', 'rev', [], _('revision')), |
| 3553 ('c', 'change', '', _('change made by revision')) | 3556 ('c', 'change', '', _('change made by revision')) |
| 3554 ] + diffopts + diffopts2 + walkopts, | 3557 ] + diffopts + diffopts2 + walkopts, |
| 3555 _('[OPTION]... [-r REV1 [-r REV2]] [FILE]...')), | 3558 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')), |
| 3556 "^export": | 3559 "^export": |
| 3557 (export, | 3560 (export, |
| 3558 [('o', 'output', '', _('print output to file with formatted name')), | 3561 [('o', 'output', '', _('print output to file with formatted name')), |
| 3559 ('', 'switch-parent', None, _('diff against the second parent')), | 3562 ('', 'switch-parent', None, _('diff against the second parent')), |
| 3560 ('r', 'rev', [], _('revisions to export')), | 3563 ('r', 'rev', [], _('revisions to export')), |