Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hg.1.txt @ 1728:9b92b71d5dd7
add -w and -p options to diff. this is for issue 126.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 15 Feb 2006 10:39:47 -0800 |
parents | f5e194047f1e |
children | 251729df9cc6 |
comparison
equal
deleted
inserted
replaced
1722:681c5c211b92 | 1728:9b92b71d5dd7 |
---|---|
221 Without the -a option, diff will avoid generating diffs of files | 221 Without the -a option, diff will avoid generating diffs of files |
222 it detects as binary. With -a, diff will generate a diff anyway, | 222 it detects as binary. With -a, diff will generate a diff anyway, |
223 probably with undesirable results. | 223 probably with undesirable results. |
224 | 224 |
225 options: | 225 options: |
226 -a, --text treat all files as text | 226 -a, --text treat all files as text |
227 -I, --include <pat> include names matching the given patterns | 227 -I, --include <pat> include names matching the given patterns |
228 -X, --exclude <pat> exclude names matching the given patterns | 228 -p, --show-function show which function each change is in |
229 -X, --exclude <pat> exclude names matching the given patterns | |
230 -w, --ignore-all-space ignore white space when comparing lines | |
229 | 231 |
230 export [-o filespec] [revision] ...:: | 232 export [-o filespec] [revision] ...:: |
231 Print the changeset header and diffs for one or more revisions. | 233 Print the changeset header and diffs for one or more revisions. |
232 | 234 |
233 The information shown in the changeset header is: author, | 235 The information shown in the changeset header is: author, |