changeset 8817 | 6c9dce20ed70 |
parent 8810 | ac92775b3b80 |
child 10102 | 1720d70cd6d4 |
--- a/tests/test-import-eol.out Mon Jun 15 02:51:10 2009 -0500 +++ b/tests/test-import-eol.out Tue Jun 16 16:22:42 2009 +0100 @@ -5,11 +5,11 @@ abort: Unsupported line endings type: LFCR % force LF applying eol.diff -'a\ny\nc\nd\nz' +'a\nyyyy\ncc\n\nd\ne' % force CRLF 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying eol.diff -'a\r\ny\r\nc\r\nd\r\nz' +'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' adding b % binary patch with --eol applying bin.diff