##// END OF EJS Templates
Merge with crew-stable
Merge with crew-stable

File last commit:

r8817:6c9dce20 default
r9471:bccf780f merge default
Show More
test-import-eol.out
16 lines | 348 B | text/plain | TextLexer
/ tests / test-import-eol.out
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 adding .hgignore
adding a
% invalid eol
applying eol.diff
abort: Unsupported line endings type: LFCR
% force LF
applying eol.diff
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 'a\nyyyy\ncc\n\nd\ne'
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 % force CRLF
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne'
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc'