mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +03:00
32 lines
395 B
Plaintext
32 lines
395 B
Plaintext
|
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
|
||
|
|
|