tests/test-merge4.out
changeset 2175 b2ae81a7df29
parent 925 5a034646e472
child 6336 4b0c9c674707
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
       
     1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     3 (branch merge, don't forget to commit)