equal
deleted
inserted
replaced
6 % import patch that already exists |
6 % import patch that already exists |
7 abort: patch "url.diff" already exists |
7 abort: patch "url.diff" already exists |
8 applying url.diff |
8 applying url.diff |
9 now at: url.diff |
9 now at: url.diff |
10 foo |
10 foo |
|
11 popping url.diff |
11 patch queue now empty |
12 patch queue now empty |
12 % qimport -f |
13 % qimport -f |
13 adding url.diff to series file |
14 adding url.diff to series file |
14 applying url.diff |
15 applying url.diff |
15 now at: url.diff |
16 now at: url.diff |
16 foo2 |
17 foo2 |
|
18 popping url.diff |
17 patch queue now empty |
19 patch queue now empty |
18 % build diff with CRLF |
20 % build diff with CRLF |
19 adding b |
21 adding b |
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21 % qimport CRLF diff |
23 % qimport CRLF diff |