equal
deleted
inserted
replaced
7 Hunk #1 FAILED at 0 |
7 Hunk #1 FAILED at 0 |
8 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
8 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
9 patch failed, unable to continue (try -v) |
9 patch failed, unable to continue (try -v) |
10 patch failed, rejects left in working dir |
10 patch failed, rejects left in working dir |
11 errors during apply, please fix and refresh eol.diff |
11 errors during apply, please fix and refresh eol.diff |
|
12 popping eol.diff |
12 patch queue now empty |
13 patch queue now empty |
13 % invalid eol |
14 % invalid eol |
14 applying eol.diff |
15 applying eol.diff |
15 patch failed, unable to continue (try -v) |
16 patch failed, unable to continue (try -v) |
16 patch failed, rejects left in working dir |
17 patch failed, rejects left in working dir |
17 errors during apply, please fix and refresh eol.diff |
18 errors during apply, please fix and refresh eol.diff |
|
19 popping eol.diff |
18 patch queue now empty |
20 patch queue now empty |
19 % force LF |
21 % force LF |
20 applying eol.diff |
22 applying eol.diff |
21 now at: eol.diff |
23 now at: eol.diff |
22 test message<LF> |
24 test message<LF> |
40 a<CR><LF> |
42 a<CR><LF> |
41 y<CR><LF> |
43 y<CR><LF> |
42 c<CR><LF> |
44 c<CR><LF> |
43 d<CR><LF> |
45 d<CR><LF> |
44 z |
46 z |
|
47 popping eol.diff |
45 patch queue now empty |
48 patch queue now empty |
46 % push again forcing LF and compare revisions |
49 % push again forcing LF and compare revisions |
47 applying eol.diff |
50 applying eol.diff |
48 now at: eol.diff |
51 now at: eol.diff |
49 a<CR><LF> |
52 a<CR><LF> |
50 y<CR><LF> |
53 y<CR><LF> |
51 c<CR><LF> |
54 c<CR><LF> |
52 d<CR><LF> |
55 d<CR><LF> |
53 z |
56 z |
|
57 popping eol.diff |
54 patch queue now empty |
58 patch queue now empty |
55 % push again without LF and compare revisions |
59 % push again without LF and compare revisions |
56 applying eol.diff |
60 applying eol.diff |
57 now at: eol.diff |
61 now at: eol.diff |
58 a<CR><LF> |
62 a<CR><LF> |
59 y<CR><LF> |
63 y<CR><LF> |
60 c<CR><LF> |
64 c<CR><LF> |
61 d<CR><LF> |
65 d<CR><LF> |
62 z |
66 z |
|
67 popping eol.diff |
63 patch queue now empty |
68 patch queue now empty |