mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
67 lines
856 B
Plaintext
67 lines
856 B
Plaintext
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
@ 5: L3
|
|
|
|
|
o 4: L2
|
|
|
|
|
o 3: L1
|
|
|
|
|
| o 2: C3
|
|
|/
|
|
o 1: C2
|
|
|
|
|
o 0: C1
|
|
|
|
|
|
% Try to call --continue
|
|
abort: no rebase in progress
|
|
|
|
% Conflicting rebase
|
|
merging common
|
|
warning: conflicts during merge.
|
|
merging common failed!
|
|
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
|
|
|
|
% Try to continue without solving the conflict
|
|
abort: unresolved merge conflicts (see hg resolve)
|
|
|
|
% Conclude rebase
|
|
saving bundle to
|
|
adding branch
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 3 changesets with 3 changes to 3 files
|
|
rebase completed
|
|
@ 5: L3
|
|
|
|
|
o 4: L2
|
|
|
|
|
o 3: L1
|
|
|
|
|
o 2: C3
|
|
|
|
|
o 1: C2
|
|
|
|
|
o 0: C1
|
|
|
|
|
|
% Check correctness
|
|
- Rev. 0
|
|
c1
|
|
- Rev. 1
|
|
c1
|
|
c2
|
|
- Rev. 2
|
|
c1
|
|
c2
|
|
c3
|
|
- Rev. 3
|
|
c1
|
|
c2
|
|
c3
|
|
- Rev. 4
|
|
resolved merge
|
|
- Rev. 5
|
|
resolved merge
|