equal
deleted
inserted
replaced
58 Hunk #1 FAILED at 0 |
58 Hunk #1 FAILED at 0 |
59 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
59 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
60 patch failed, unable to continue (try -v) |
60 patch failed, unable to continue (try -v) |
61 patch failed, rejects left in working dir |
61 patch failed, rejects left in working dir |
62 errors during apply, please fix and refresh eol.diff |
62 errors during apply, please fix and refresh eol.diff |
|
63 [2] |
63 $ hg qpop |
64 $ hg qpop |
64 popping eol.diff |
65 popping eol.diff |
65 patch queue now empty |
66 patch queue now empty |
66 |
67 |
67 invalid eol |
68 invalid eol |
69 $ hg --config patch.eol='LFCR' qpush |
70 $ hg --config patch.eol='LFCR' qpush |
70 applying eol.diff |
71 applying eol.diff |
71 patch failed, unable to continue (try -v) |
72 patch failed, unable to continue (try -v) |
72 patch failed, rejects left in working dir |
73 patch failed, rejects left in working dir |
73 errors during apply, please fix and refresh eol.diff |
74 errors during apply, please fix and refresh eol.diff |
|
75 [2] |
74 $ hg qpop |
76 $ hg qpop |
75 popping eol.diff |
77 popping eol.diff |
76 patch queue now empty |
78 patch queue now empty |
77 |
79 |
78 force LF |
80 force LF |