Mercurial > hg > mercurial-source
comparison tests/test-merge-types.t @ 17742:405b6bd015df
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 | 722fd97f6645 |
children | 44bda93df90e |
comparison
equal
deleted
inserted
replaced
17741:a51304b851c6 | 17742:405b6bd015df |
---|