tests/test-merge-revert.out
changeset 833 ad8ff3534fde
parent 808 8f5637f0a0c0
child 836 1fe3b14c7044
equal deleted inserted replaced
832:b65773f7db41 833:ad8ff3534fde
    24 3aa14bbc23d9 tip
    24 3aa14bbc23d9 tip
    25 + hg update -C 0
    25 + hg update -C 0
    26 + hg update
    26 + hg update
    27 merging file1
    27 merging file1
    28 + hg diff
    28 + hg diff
       
    29 FIXME: This is a known bug:
    29 + hg status
    30 + hg status
    30 + hg id
    31 + hg id
    31 3aa14bbc23d9 tip
    32 3aa14bbc23d9 tip
    32 + hg revert
    33 + hg revert
    33 + hg diff
    34 + hg diff