Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.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 5707bfe04deb
children c0170d88ed2b
line wrap: on
line diff
--- a/mercurial/patch.py	Fri Aug 25 11:20:34 2017 -0700
+++ b/mercurial/patch.py	Tue Aug 29 18:20:50 2017 -0700
@@ -2282,6 +2282,7 @@
                                           'ignorewsamount')
         buildopts['ignoreblanklines'] = get('ignore_blank_lines',
                                             'ignoreblanklines')
+        buildopts['ignorewseol'] = get('ignore_space_at_eol', 'ignorewseol')
     if formatchanging:
         buildopts['text'] = opts and opts.get('text')
         binary = None if opts is None else opts.get('binary')