author | Martin Geisler <mg@daimi.au.dk> |
Sat, 14 Feb 2009 01:07:44 +0100 | |
changeset 7761 | 1e70db1825d2 |
parent 6906 | 808f03f61ebe |
child 11198 | b345b1cc124f |
permissions | -rw-r--r-- |
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