Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq.out @ 3332:534806df5b5a
Test case for bdiff on buffer objects
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 11 Oct 2006 12:02:06 -0700 |
| parents | 760414dc7ac6 |
| children | ba3a96750de0 |
comparison
equal
deleted
inserted
replaced
| 3331:8ec80c1b8f0b | 3332:534806df5b5a |
|---|---|
| 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 |