Mercurial > hg
view tests/test-rebase-abort.out @ 7179:3d080733a339
merge with crew-stable
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 19 Oct 2008 22:07:43 +0200 |
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