Mercurial > hg
view tests/test-import-eol.out @ 9968:8c923a18e7ae
Merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 30 Nov 2009 23:27:37 +0100 |
parents | 6c9dce20ed70 |
children | 1720d70cd6d4 |
line wrap: on
line source
adding .hgignore adding a % invalid eol applying eol.diff abort: Unsupported line endings type: LFCR % force LF applying eol.diff '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\nyyyy\r\ncc\r\n\r\nd\r\ne' adding b % binary patch with --eol applying bin.diff 'a\x00\nc'