equal
deleted
inserted
replaced
8 'a\nyyyy\ncc\n\nd\ne' |
8 'a\nyyyy\ncc\n\nd\ne' |
9 % force CRLF |
9 % force CRLF |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 applying eol.diff |
11 applying eol.diff |
12 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' |
12 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' |
|
13 % auto EOL on LF file |
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 applying eol.diff |
|
16 'a\nyyyy\ncc\n\nd\ne' |
|
17 % auto EOL on CRLF file |
|
18 applying eol.diff |
|
19 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' |
13 adding b |
20 adding b |
14 % binary patch with --eol |
21 % binary patch with --eol |
15 applying bin.diff |
22 applying bin.diff |
16 'a\x00\nc' |
23 'a\x00\nc' |