tests/test-merge-revert.out
changeset 866 6d6095823b82
parent 839 9c918287d10b
parent 862 d70c1c31fd45
child 894 62ec665759f2
child 896 01215ad04283
equal deleted inserted replaced
859:6390c377a9e6 866:6d6095823b82
    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:
       
    30 + hg status
    29 + hg status
    31 + hg id
    30 + hg id
    32 3aa14bbc23d9 tip
    31 3aa14bbc23d9 tip
    33 + hg revert
    32 + hg revert
    34 + hg diff
    33 + hg diff