tests/test-rebase-conflicts.out
changeset 7278 45495d784ad6
parent 6906 808f03f61ebe
child 11197 4bb4895e1693
equal deleted inserted replaced
7277:3e000e2bf5f6 7278:45495d784ad6
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     2 created new head
     2 created new head
     3 @  4: L2
     3 @  5: L3
       
     4 |
       
     5 o  4: L2
     4 |
     6 |
     5 o  3: L1
     7 o  3: L1
     6 |
     8 |
     7 | o  2: C3
     9 | o  2: C3
     8 |/
    10 |/
    27 saving bundle to 
    29 saving bundle to 
    28 adding branch
    30 adding branch
    29 adding changesets
    31 adding changesets
    30 adding manifests
    32 adding manifests
    31 adding file changes
    33 adding file changes
    32 added 2 changesets with 2 changes to 2 files
    34 added 3 changesets with 3 changes to 3 files
    33 rebase completed
    35 rebase completed
    34 @  4: L2
    36 @  5: L3
       
    37 |
       
    38 o  4: L2
    35 |
    39 |
    36 o  3: L1
    40 o  3: L1
    37 |
    41 |
    38 o  2: C3
    42 o  2: C3
    39 |
    43 |
    40 o  1: C2
    44 o  1: C2
    41 |
    45 |
    42 o  0: C1
    46 o  0: C1
    43 
    47 
       
    48 
       
    49 % Check correctness
       
    50   - Rev. 0
       
    51 c1
       
    52   - Rev. 1
       
    53 c1
       
    54 c2
       
    55   - Rev. 2
       
    56 c1
       
    57 c2
       
    58 c3
       
    59   - Rev. 3
       
    60 c1
       
    61 c2
       
    62 c3
       
    63   - Rev. 4
       
    64 resolved merge
       
    65   - Rev. 5
       
    66 resolved merge