##// END OF EJS Templates
commands: mention diff -c
timeless -
r10520:75361931 stable
parent child Browse files
Show More
@@ -1114,6 +1114,9 b' def diff(ui, repo, *pats, **opts):'
1114 1114 revisions are specified, the working directory files are compared
1115 1115 to its parent.
1116 1116
1117 Alternatively you can specify -c/--change with a revision to use
1118 as a baseline.
1119
1117 1120 Without the -a/--text option, diff will avoid generating diffs of
1118 1121 files it detects as binary. With -a, diff will generate a diff
1119 1122 anyway, probably with undesirable results.
@@ -3552,7 +3555,7 b' table = {'
3552 3555 [('r', 'rev', [], _('revision')),
3553 3556 ('c', 'change', '', _('change made by revision'))
3554 3557 ] + diffopts + diffopts2 + walkopts,
3555 _('[OPTION]... [-r REV1 [-r REV2]] [FILE]...')),
3558 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
3556 3559 "^export":
3557 3560 (export,
3558 3561 [('o', 'output', '', _('print output to file with formatted name')),
@@ -366,7 +366,7 b' verify the integrity of the repository'
366 366 and indices.
367 367
368 368 use "hg -v help verify" to show global options
369 hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...
369 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
370 370
371 371 diff repository (or selected files)
372 372
@@ -383,6 +383,9 b' diff repository (or selected files)'
383 383 compared to the working directory, and, when no revisions are specified,
384 384 the working directory files are compared to its parent.
385 385
386 Alternatively you can specify -c/--change with a revision to use as a
387 baseline.
388
386 389 Without the -a/--text option, diff will avoid generating diffs of files it
387 390 detects as binary. With -a, diff will generate a diff anyway, probably
388 391 with undesirable results.
General Comments 0
You need to be logged in to leave comments. Login now