tests/test-merge4.out
changeset 11977 db2a291e25e9
parent 11976 b28fc3b3efd6
child 11978 ef4a1ffbf519
equal deleted inserted replaced
11976:b28fc3b3efd6 11977:db2a291e25e9
     1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
     2 created new head
       
     3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     4 (branch merge, don't forget to commit)