Mercurial > hg

comparison tests/test-diff-newlines.t @ 17742:405b6bd015df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: allow test output lines to be terminated with \r in addition to \n str.splitlines could not be used in 546c76e5a3e6, but _now_ we would like to have lines with other line endings than \n. Some fine occurences of (esc) markup of \r is replaced with multiple lines ending with '\r (no-eol) (esc)'. That is no win but also no significant loss. This change makes it possible to drop filtercr.py - _that_ is a win.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 26 Sep 2012 00:56:27 +0200
parents cf0f3cb8a332
children c63a09b6b337
comparison
equal deleted inserted replaced
17741:a51304b851c6 17742:405b6bd015df
11 diff -r 107ba6f817b5 -r 310ce7989cdc a 11 diff -r 107ba6f817b5 -r 310ce7989cdc a
12 --- a/a Thu Jan 01 00:00:01 1970 +0000 12 --- a/a Thu Jan 01 00:00:01 1970 +0000
13 +++ b/a Thu Jan 01 00:00:02 1970 +0000 13 +++ b/a Thu Jan 01 00:00:02 1970 +0000
14 @@ -1,2 +1,3 @@ 14 @@ -1,2 +1,3 @@
15 confuse str.splitlines 15 confuse str.splitlines
16 embedded\rnewline (esc) 16 embedded\r (no-eol) (esc)
17 newline
17 +clean diff 18 +clean diff
18 19