Mercurial > hg
view tests/test-hgrc.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 | a3d73b3e1f8a |
children | 7cdd2a7db2c2 e95f0f70c3fd |
line wrap: on
line source
hg: config error at .../t/.hg/hgrc:1: 'invalid' updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [paths] default = .../foo%bar default = .../foo%bar bundle.mainreporoot=.../foobar defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.tag=-d "0 0" paths.default=.../foo%bar ui.slash=True hg: config error at $HGRCPATH:8: ' x = y'