Show More
@@ -2483,14 +2483,17 b' def diff(ui, repo, *pats, **opts):' | |||
|
2483 | 2483 | default to comparing against the working directory's first |
|
2484 | 2484 | parent changeset if no revisions are specified. |
|
2485 | 2485 | |
|
2486 | When two revision arguments are given, then changes are shown | |
|
2487 | between those revisions. If only one revision is specified then | |
|
2488 | that revision is compared to the working directory, and, when no | |
|
2489 | revisions are specified, the working directory files are compared | |
|
2490 | to its first parent. | |
|
2491 | ||
|
2492 | Alternatively you can specify -c/--change with a revision to see | |
|
2493 | the changes in that changeset relative to its first parent. | |
|
2486 | By default, the working directory files are compared to its first parent. To | |
|
2487 | see the differences from another revision, use --from. To see the difference | |
|
2488 | to another revision, use --to. For example, :hg:`diff --from .^` will show | |
|
2489 | the differences from the working copy's grandparent to the working copy, | |
|
2490 | :hg:`diff --to .` will show the diff from the working copy to its parent | |
|
2491 | (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will | |
|
2492 | show the diff between those two revisions. | |
|
2493 | ||
|
2494 | Alternatively you can specify -c/--change with a revision to see the changes | |
|
2495 | in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is | |
|
2496 | equivalent to :hg:`diff --from 42^ --to 42`) | |
|
2494 | 2497 | |
|
2495 | 2498 | Without the -a/--text option, diff will avoid generating diffs of |
|
2496 | 2499 | files it detects as binary. With -a, diff will generate a diff |
@@ -642,13 +642,17 b' Test command without options' | |||
|
642 | 642 | default to comparing against the working directory's first parent |
|
643 | 643 | changeset if no revisions are specified. |
|
644 | 644 | |
|
645 | When two revision arguments are given, then changes are shown between | |
|
646 | those revisions. If only one revision is specified then that revision is | |
|
647 | compared to the working directory, and, when no revisions are specified, | |
|
648 | the working directory files are compared to its first parent. | |
|
645 | By default, the working directory files are compared to its first parent. | |
|
646 | To see the differences from another revision, use --from. To see the | |
|
647 | difference to another revision, use --to. For example, 'hg diff --from .^' | |
|
648 | will show the differences from the working copy's grandparent to the | |
|
649 | working copy, 'hg diff --to .' will show the diff from the working copy to | |
|
650 | its parent (i.e. the reverse of the default), and 'hg diff --from 1.0 --to | |
|
651 | 1.2' will show the diff between those two revisions. | |
|
649 | 652 |
|
|
650 | 653 | Alternatively you can specify -c/--change with a revision to see the |
|
651 |
|
|
|
654 | changes in that changeset relative to its first parent (i.e. 'hg diff -c | |
|
655 | 42' is equivalent to 'hg diff --from 42^ --to 42') | |
|
652 | 656 |
|
|
653 | 657 | Without the -a/--text option, diff will avoid generating diffs of files it |
|
654 | 658 | detects as binary. With -a, diff will generate a diff anyway, probably |
General Comments 0
You need to be logged in to leave comments.
Login now