tests/test-merge4.out
branchstable
changeset 12795 3cb0559e44d0
parent 12793 469850088fc1
parent 12794 6bf8d48bec8e
child 12796 bc69ba99e34b
equal deleted inserted replaced
12793:469850088fc1 12795:3cb0559e44d0
     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)