834 will be passed the names of two directories to compare, unless the --per- |
834 will be passed the names of two directories to compare, unless the --per- |
835 file option is specified (see below). To pass additional options to the |
835 file option is specified (see below). To pass additional options to the |
836 program, use -o/--option. These will be passed before the names of the |
836 program, use -o/--option. These will be passed before the names of the |
837 directories or files to compare. |
837 directories or files to compare. |
838 |
838 |
839 When two revision arguments are given, then changes are shown between |
839 The --from, --to, and --change options work the same way they do for 'hg |
840 those revisions. If only one revision is specified then that revision is |
840 diff'. |
841 compared to the working directory, and, when no revisions are specified, |
|
842 the working directory files are compared to its parent. |
|
843 |
841 |
844 The --per-file option runs the external program repeatedly on each file to |
842 The --per-file option runs the external program repeatedly on each file to |
845 diff, instead of once on two directories. By default, this happens one by |
843 diff, instead of once on two directories. By default, this happens one by |
846 one, where the next file diff is open in the external program only once |
844 one, where the next file diff is open in the external program only once |
847 the previous external program (for the previous file diff) has exited. If |
845 the previous external program (for the previous file diff) has exited. If |
857 |
855 |
858 options ([+] can be repeated): |
856 options ([+] can be repeated): |
859 |
857 |
860 -p --program CMD comparison program to run |
858 -p --program CMD comparison program to run |
861 -o --option OPT [+] pass option to comparison program |
859 -o --option OPT [+] pass option to comparison program |
862 -r --rev REV [+] revision |
860 --from REV1 revision to diff from |
|
861 --to REV2 revision to diff to |
863 -c --change REV change made by revision |
862 -c --change REV change made by revision |
864 --per-file compare each file instead of revision snapshots |
863 --per-file compare each file instead of revision snapshots |
865 --confirm prompt user before each external program invocation |
864 --confirm prompt user before each external program invocation |
866 --patch compare patches for two revisions |
865 --patch compare patches for two revisions |
867 -I --include PATTERN [+] include names matching the given patterns |
866 -I --include PATTERN [+] include names matching the given patterns |