tests/test-rebase-abort.out
author Alex Unden <alu@zpuppet.org>
Fri, 27 Feb 2009 02:01:45 -0800
changeset 7817 cb516e788238
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
bookmarks: fixes bug where a deleted bookmark may still be treated as current when track.current option is set

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