tests/test-evolve-issue5958.t
changeset 5341 13376ca93fa3
parent 5323 417503ef667d
child 5345 a73cdef2e33f
equal deleted inserted replaced
5340:9351e6c22e74 5341:13376ca93fa3
    89   merge:[6] add foo.txt
    89   merge:[6] add foo.txt
    90   with: [4] add foo.txt
    90   with: [4] add foo.txt
    91   base: [1] add foo.txt
    91   base: [1] add foo.txt
    92   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    92   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    93   1 new orphan changesets
    93   1 new orphan changesets
    94   working directory is now at 459c64f7eaad
    94   working directory is now at 8b11b92203c7