Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 29975:c15f06109b7a
localrepo: use single quotes in use warning
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Tue, 20 Sep 2016 23:48:08 +0000 |
| parents | 3e7ded768556 |
| children | 0accd5a5ad04 |
comparison
equal
deleted
inserted
replaced
| 29974:7109d5ddeb0c | 29975:c15f06109b7a |
|---|---|
| 73 Try to continue without solving the conflict: | 73 Try to continue without solving the conflict: |
| 74 | 74 |
| 75 $ hg rebase --continue | 75 $ hg rebase --continue |
| 76 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | 76 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
| 77 rebasing 4:46f0b057b5c0 "L2" | 77 rebasing 4:46f0b057b5c0 "L2" |
| 78 abort: unresolved merge conflicts (see "hg help resolve") | 78 abort: unresolved merge conflicts (see 'hg help resolve') |
| 79 [255] | 79 [255] |
| 80 | 80 |
| 81 Conclude rebase: | 81 Conclude rebase: |
| 82 | 82 |
| 83 $ echo 'resolved merge' >common | 83 $ echo 'resolved merge' >common |