tests/test-excessive-merge.out
changeset 2175 b2ae81a7df29
parent 2152 57729c56a23c
child 5405 8feb33c2d153
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
       
     1 1 files updated, 0 files merged, 0 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)
       
     4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     6 (branch merge, don't forget to commit)
     1 changeset:   4:f6c172c6198c
     7 changeset:   4:f6c172c6198c
     2 tag:         tip
     8 tag:         tip
     3 parent:      1:448a8c5e42f1
     9 parent:      1:448a8c5e42f1
     4 parent:      2:7c5dc2e857f2
    10 parent:      2:7c5dc2e857f2
     5 user:        test
    11 user:        test