Mercurial > hg
view tests/test-rebase-abort.out @ 8861:90f74b31ed4f
filemerge: fix internal:dump
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 20 Jun 2009 16:42:51 -0500 |
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