equal
deleted
inserted
replaced
162 --- /dev/null |
162 --- /dev/null |
163 +++ b/b/f |
163 +++ b/b/f |
164 @@ -0,0 +1,1 @@ |
164 @@ -0,0 +1,1 @@ |
165 +f |
165 +f |
166 M a |
166 M a |
|
167 % qpush failure |
|
168 Patch queue now empty |
|
169 applying foo |
|
170 applying bar |
|
171 1 out of 1 hunk ignored -- saving rejects to file foo.rej |
|
172 patch failed, unable to continue (try -v) |
|
173 patch failed, rejects left in working dir |
|
174 Errors during apply, please fix and refresh bar |
167 new file |
175 new file |
168 |
176 |
169 diff --git a/new b/new |
177 diff --git a/new b/new |
170 new file mode 100755 |
178 new file mode 100755 |
171 --- /dev/null |
179 --- /dev/null |