Mercurial > public > mercurial-scm > hg-stable
diff tests/test-diff-ignore-whitespace.t @ 12942:05fffd665170 stable
tests: use (esc) for all non-ASCII test output
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 08 Nov 2010 01:41:41 +0100 |
| parents | 8eb758ea738c |
| children | 3774e1453ef4 |
line wrap: on
line diff
--- a/tests/test-diff-ignore-whitespace.t Mon Nov 08 01:35:41 2010 +0100 +++ b/tests/test-diff-ignore-whitespace.t Mon Nov 08 01:41:41 2010 +0100 @@ -402,10 +402,9 @@ @@ -1,2 +1,3 @@ -hello world -goodbye world - +hello world - + - +goodbye world -world + +hello world\r (esc) + +\r (esc) + +goodbye\rworld (esc) No completely blank lines to ignore: @@ -416,10 +415,9 @@ @@ -1,2 +1,3 @@ -hello world -goodbye world - +hello world - + - +goodbye world -world + +hello world\r (esc) + +\r (esc) + +goodbye\rworld (esc) Only new line noticed: @@ -429,7 +427,7 @@ +++ b/foo @@ -1,2 +1,3 @@ hello world - + + +\r (esc) goodbye world $ hg ndiff --ignore-all-space @@ -438,7 +436,7 @@ +++ b/foo @@ -1,2 +1,3 @@ hello world - + + +\r (esc) goodbye world New line not noticed when space change ignored: