comparison mercurial/commands.py @ 27452:5df74b2f296d

diff: clarify comparison as first parent
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:52:25 +0000
parents 71d0fd3c2e24
children 8914296e74a2
comparison
equal deleted inserted replaced
27451:f209c85183a7 27452:5df74b2f296d
3539 3539
3540 When two revision arguments are given, then changes are shown 3540 When two revision arguments are given, then changes are shown
3541 between those revisions. If only one revision is specified then 3541 between those revisions. If only one revision is specified then
3542 that revision is compared to the working directory, and, when no 3542 that revision is compared to the working directory, and, when no
3543 revisions are specified, the working directory files are compared 3543 revisions are specified, the working directory files are compared
3544 to its parent. 3544 to its first parent.
3545 3545
3546 Alternatively you can specify -c/--change with a revision to see 3546 Alternatively you can specify -c/--change with a revision to see
3547 the changes in that changeset relative to its first parent. 3547 the changes in that changeset relative to its first parent.
3548 3548
3549 Without the -a/--text option, diff will avoid generating diffs of 3549 Without the -a/--text option, diff will avoid generating diffs of