tests/test-rebase-abort.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Fri, 07 Nov 2008 10:37:20 +0100
changeset 7325 f9985108d4e4
parent 6906 808f03f61ebe
child 11198 b345b1cc124f
permissions -rw-r--r--
graphlog: split the actual DAG grapher out into a separate method This allows extensions like pbranch to use asciigraph() to graph dependencies for patch branches, but could be used for basically any DAG.

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