author | Matt Mackall <mpm@selenic.com> |
Fri, 04 Jun 2010 10:27:23 -0500 | |
changeset 11284 | 0b5c2e82aeb5 |
parent 11201 | 34023f2ca305 |
child 11316 | 7fa3968004c1 |
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 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