Mercurial > hg
comparison tests/test-rebase-abort.out @ 6906:808f03f61ebe
Add rebase extension
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Mon, 18 Aug 2008 21:16:31 +0200 |
| parents | |
| children | b345b1cc124f |
comparison
equal
deleted
inserted
replaced
| 6905:248e54a9456e | 6906:808f03f61ebe |
|---|---|
| 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 2 created new head | |
| 3 @ 4: L2 | |
| 4 | | |
| 5 o 3: L1 | |
| 6 | | |
| 7 | o 2: C3 | |
| 8 |/ | |
| 9 o 1: C2 | |
| 10 | | |
| 11 o 0: C1 | |
| 12 | |
| 13 | |
| 14 % Conflicting rebase | |
| 15 merging common | |
| 16 warning: conflicts during merge. | |
| 17 merging common failed! | |
| 18 abort: fix unresolved conflicts with hg resolve then run hg rebase --continue | |
| 19 | |
| 20 % Abort | |
| 21 rebase aborted | |
| 22 @ 4: L2 | |
| 23 | | |
| 24 o 3: L1 | |
| 25 | | |
| 26 | o 2: C3 | |
| 27 |/ | |
| 28 o 1: C2 | |
| 29 | | |
| 30 o 0: C1 | |
| 31 |