##// END OF EJS Templates
merge with default
merge with default

File last commit:

r10102:1720d70c default
r10115:c2362638 merge default
Show More
test-import-eol.out
23 lines | 553 B | text/plain | TextLexer
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'
adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc'