Mercurial > hg
view tests/test-custom-filters.out @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | f3a8b5360100 |
children |
line wrap: on
line source
% Repository data: Some stuff to ponder very carefully. % Fresh checkout: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Copyright 2046, The Masters Some stuff to ponder very carefully. M stuff.txt % Problem encoding: abort: missing header "Copyright 2046, The Masters" in morestuff.txt M stuff.txt A morestuff.txt