tests/test-merge-revert.out
changeset 3317 966632304dde
parent 2175 b2ae81a7df29
child 3407 d2b55e3c4e25
equal deleted inserted replaced
3316:0e370798eebf 3317:966632304dde
     9 eb43f19ff115
     9 eb43f19ff115
    10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    11 ? file1.orig
    11 ? file1.orig
    12 016807e6fdaf tip
    12 016807e6fdaf tip
    13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    14 merging file1
       
    15 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    14 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    16 ? file1.orig
    15 ? file1.orig
    17 016807e6fdaf tip
    16 016807e6fdaf tip
    18 ? file1.orig
    17 ? file1.orig
    19 016807e6fdaf tip
    18 016807e6fdaf tip