Mercurial > hg-stable
comparison tests/test-help.t @ 34031:da07367d683b
mdiff: add a --ignore-space-at-eol option
Add an option that only ignores whitespaces at EOL. The name of the option is
the same as Git.
.. feature::
Added `--ignore-space-at-eol` diff option to ignore whitespace differences
at line endings.
Differential Revision: https://phab.mercurial-scm.org/D422
author | David Soria Parra <davidsp@fb.com> |
---|---|
date | Tue, 29 Aug 2017 18:20:50 -0700 |
parents | dc95caa1ec0d |
children | cab34bda259e |
comparison
equal
deleted
inserted
replaced
34030:dcfdf4d09663 | 34031:da07367d683b |
---|---|
551 -p --show-function show which function each change is in | 551 -p --show-function show which function each change is in |
552 --reverse produce a diff that undoes the changes | 552 --reverse produce a diff that undoes the changes |
553 -w --ignore-all-space ignore white space when comparing lines | 553 -w --ignore-all-space ignore white space when comparing lines |
554 -b --ignore-space-change ignore changes in the amount of white space | 554 -b --ignore-space-change ignore changes in the amount of white space |
555 -B --ignore-blank-lines ignore changes whose lines are all blank | 555 -B --ignore-blank-lines ignore changes whose lines are all blank |
556 -Z --ignore-space-at-eol ignore changes in whitespace at EOL | |
556 -U --unified NUM number of lines of context to show | 557 -U --unified NUM number of lines of context to show |
557 --stat output diffstat-style summary of changes | 558 --stat output diffstat-style summary of changes |
558 --root DIR produce diffs relative to subdirectory | 559 --root DIR produce diffs relative to subdirectory |
559 -I --include PATTERN [+] include names matching the given patterns | 560 -I --include PATTERN [+] include names matching the given patterns |
560 -X --exclude PATTERN [+] exclude names matching the given patterns | 561 -X --exclude PATTERN [+] exclude names matching the given patterns |