Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 34031:da07367d683b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
34030:dcfdf4d09663 34031:da07367d683b
121 _('ignore white space when comparing lines')), 121 _('ignore white space when comparing lines')),
122 ('b', 'ignore-space-change', None, 122 ('b', 'ignore-space-change', None,
123 _('ignore changes in the amount of white space')), 123 _('ignore changes in the amount of white space')),
124 ('B', 'ignore-blank-lines', None, 124 ('B', 'ignore-blank-lines', None,
125 _('ignore changes whose lines are all blank')), 125 _('ignore changes whose lines are all blank')),
126 ('Z', 'ignore-space-at-eol', None,
127 _('ignore changes in whitespace at EOL')),
126 ] 128 ]
127 129
128 diffopts2 = [ 130 diffopts2 = [
129 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')), 131 ('', 'noprefix', None, _('omit a/ and b/ prefixes from filenames')),
130 ('p', 'show-function', None, _('show which function each change is in')), 132 ('p', 'show-function', None, _('show which function each change is in')),