Mercurial > hg
diff tests/test-help.out @ 10520:75361931884d stable
commands: mention diff -c
author | timeless <timeless@mozdev.org> |
---|---|
date | Sun, 21 Feb 2010 01:21:17 +0200 |
parents | 37b735d27347 |
children | 9c0ba837dc65 |
line wrap: on
line diff
--- a/tests/test-help.out Sat Feb 20 20:08:42 2010 +0100 +++ b/tests/test-help.out Sun Feb 21 01:21:17 2010 +0200 @@ -366,7 +366,7 @@ and indices. use "hg -v help verify" to show global options -hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... +hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]... diff repository (or selected files) @@ -383,6 +383,9 @@ compared to the working directory, and, when no revisions are specified, the working directory files are compared to its parent. + Alternatively you can specify -c/--change with a revision to use as a + baseline. + Without the -a/--text option, diff will avoid generating diffs of files it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results.