comparison mercurial/commands.py @ 10527:9c0ba837dc65 stable

commands: correct diff -c explanation
author timeless <timeless@mozdev.org>
date Tue, 23 Feb 2010 06:42:10 +0100
parents 75361931884d
children fac67f0bfbb2
comparison
equal deleted inserted replaced
10526:72d3a02c62e6 10527:9c0ba837dc65
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 1116
1117 Alternatively you can specify -c/--change with a revision to use 1117 Alternatively you can specify -c/--change with a revision to see
1118 as a baseline. 1118 the changes in that changeset relative to its first parent.
1119 1119
1120 Without the -a/--text option, diff will avoid generating diffs of 1120 Without the -a/--text option, diff will avoid generating diffs of
1121 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
1122 anyway, probably with undesirable results. 1122 anyway, probably with undesirable results.
1123 1123