Mercurial > hg

view tests/test-rebase-abort.out @ 10386:1ddb0ae26a55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
zeroconf: better fix for readName error Stop parsing when an unknown type is seen, since it is impossible to resynchronize on the stream.
author Brendan Cully <brendan@kublai.com>
date Sun, 07 Feb 2010 19:39:29 +0100
parents 808f03f61ebe
children b345b1cc124f
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1


% Conflicting rebase
merging common
warning: conflicts during merge.
merging common failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue

% Abort
rebase aborted
@  4: L2
|
o  3: L1
|
| o  2: C3
|/
o  1: C2
|
o  0: C1