view tests/test-rebase-abort.out @ 7331:650e9d6988cb

Keep sessionvars with repository links added in a0843c82d1a2 Without this, e.g. "?style=coal" would be dropped.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Nov 2008 13:22:41 +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