Mercurial > hg
view tests/test-import-eol.out @ 10609:5ee3faa7c563
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 07 Mar 2010 22:04:35 -0600 |
parents | 7936cd261dc9 |
children | a4fbbe0fbc38 |
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' % auto EOL on LF file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying eol.diff 'a\nyyyy\ncc\n\nd\ne' % auto EOL on CRLF file applying eol.diff 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' % auto EOL on new file or source without any EOL applying noeol.diff 'noeol\r\nnoeol\n' 'neweol\nneweol\r\n' adding b % binary patch with --eol applying bin.diff 'a\x00\nc\r\nd'