tests/test-update-reverse.out
changeset 2808 30f59f4a327e
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
equal deleted inserted replaced
2807:a8a7ce1a01a5 2808:30f59f4a327e
    38 Should show a side1 side2
    38 Should show a side1 side2
    39 a
    39 a
    40 side1
    40 side1
    41 side2
    41 side2
    42 resolving manifests
    42 resolving manifests
    43  force 1 allow None moddirstate True linear False
    43  force True allow False moddirstate True linear False
    44  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
    44  ancestor 8515d4bfda76 local 1c0f48f8ece6 remote 0594b9004bae
    45 remote deleted side2, clobbering
    45 remote deleted side2, clobbering
    46 remote deleted side1, clobbering
    46 remote deleted side1, clobbering
    47 remote created main
    47 remote created main
    48 getting main
    48 getting main