tests/test-merge-revert.out
changeset 1933 7544700fd931
parent 925 5a034646e472
child 2029 d436b21b20dc
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
     1 1:3aa14bbc23d9
     1 1:016807e6fdaf
     2 0:8633637036c1
     2 0:eb43f19ff115
     3 3aa14bbc23d9 tip
     3 016807e6fdaf tip
     4 8633637036c1
     4 eb43f19ff115
     5 8633637036c1+
     5 eb43f19ff115+
     6 8633637036c1
     6 eb43f19ff115
     7 3aa14bbc23d9 tip
     7 016807e6fdaf tip
     8 merging file1
     8 merging file1
     9 3aa14bbc23d9 tip
     9 016807e6fdaf tip
    10 3aa14bbc23d9 tip
    10 016807e6fdaf tip
    11 3aa14bbc23d9 tip
    11 016807e6fdaf tip
    12 3aa14bbc23d9 tip
    12 016807e6fdaf tip