Mercurial > public > mercurial-scm > hg

diff tests/test-diff-ignore-whitespace.t @ 15509:3774e1453ef4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
diff: --ignore-blank-lines was too enthusiastic It was ignoring changes from: ab to: a b
author Patrick Mezard <pmezard@gmail.com>
date Sun, 13 Nov 2011 21:37:14 +0100
parents 05fffd665170
children 2e8f4b82c551
line wrap: on
line diff
--- a/tests/test-diff-ignore-whitespace.t	Sat Nov 12 14:00:25 2011 +0100
+++ b/tests/test-diff-ignore-whitespace.t	Sun Nov 13 21:37:14 2011 +0100
@@ -442,3 +442,16 @@
 New line not noticed when space change ignored:
 
   $ hg ndiff --ignore-blank-lines --ignore-all-space
+
+Do not ignore all newlines, only blank lines
+
+  $ printf 'hello \nworld\ngoodbye world\n' > foo
+  $ hg ndiff --ignore-blank-lines
+  diff -r 540c40a65b78 foo
+  --- a/foo
+  +++ b/foo
+  @@ -1,2 +1,3 @@
+  -hello world
+  +hello 
+  +world
+   goodbye world