comparison mercurial/help/config.txt @ 34013: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 85d1ac011582
children 9e4f82bc2b0b
comparison
equal deleted inserted replaced
34012:dcfdf4d09663 34013:da07367d683b
310 Booleans and default to False. See :hg:`help config.diff` for 310 Booleans and default to False. See :hg:`help config.diff` for
311 related options for the diff command. 311 related options for the diff command.
312 312
313 ``ignorews`` 313 ``ignorews``
314 Ignore white space when comparing lines. 314 Ignore white space when comparing lines.
315
316 ``ignorewseol``
317 Ignore white space at the end of a line when comparing lines.
315 318
316 ``ignorewsamount`` 319 ``ignorewsamount``
317 Ignore changes in the amount of white space. 320 Ignore changes in the amount of white space.
318 321
319 ``ignoreblanklines`` 322 ``ignoreblanklines``