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

File last commit:

r8817:6c9dce20 default
r9898:b5170b8b merge default
Show More
test-import-eol.out
16 lines | 348 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'
adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc'