Mercurial > hg
view tests/test-rebase-abort.out @ 11295:07e425d63dbd
tests: use --debug on test-clone
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 03 Jun 2010 13:58:00 +0200 |
parents | 34023f2ca305 |
children | 7fa3968004c1 |
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 warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue merging common % Abort saved backup bundle to rebase aborted @ 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1