Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 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 | 3340efe80803 |
children | de286200f722 |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Fri Aug 25 11:20:34 2017 -0700 +++ b/mercurial/cmdutil.py Tue Aug 29 18:20:50 2017 -0700 @@ -123,6 +123,8 @@ _('ignore changes in the amount of white space')), ('B', 'ignore-blank-lines', None, _('ignore changes whose lines are all blank')), + ('Z', 'ignore-space-at-eol', None, + _('ignore changes in whitespace at EOL')), ] diffopts2 = [