tests/test-issue522.out
changeset 5405 8feb33c2d153
parent 5371 17ed9b9a0d03
equal deleted inserted replaced
5404:67d3daa8ac42 5405:8feb33c2d153
    11 getting foo
    11 getting foo
    12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    13 (branch merge, don't forget to commit)
    13 (branch merge, don't forget to commit)
    14 n   0         -2 unset             foo
    14 n   0         -2 unset             foo
    15 M foo
    15 M foo
    16 c6fc755d7e68f49f880599da29f15add41f42f5a 644 foo
    16 c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
    17    rev    offset  length   base linkrev nodeid       p1           p2
    17    rev    offset  length   base linkrev nodeid       p1           p2
    18      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
    18      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
    19      1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
    19      1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
    20      2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000
    20      2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000