equal
deleted
inserted
replaced
170 applying bar |
170 applying bar |
171 1 out of 1 hunk ignored -- saving rejects to file foo.rej |
171 1 out of 1 hunk ignored -- saving rejects to file foo.rej |
172 patch failed, unable to continue (try -v) |
172 patch failed, unable to continue (try -v) |
173 patch failed, rejects left in working dir |
173 patch failed, rejects left in working dir |
174 Errors during apply, please fix and refresh bar |
174 Errors during apply, please fix and refresh bar |
|
175 ? foo |
|
176 ? foo.rej |
175 new file |
177 new file |
176 |
178 |
177 diff --git a/new b/new |
179 diff --git a/new b/new |
178 new file mode 100755 |
180 new file mode 100755 |
179 --- /dev/null |
181 --- /dev/null |