tests/test-merge2.t
changeset 16913 f2719b387380
parent 13956 ffb5c09ba822
child 44177 1850066f9e36
equal deleted inserted replaced
16912:6ef3107c661e 16913:f2719b387380
    47   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    47   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    48   $ echo This is file b2 > b
    48   $ echo This is file b2 > b
    49   $ hg commit -A -m "commit #2"
    49   $ hg commit -A -m "commit #2"
    50   adding b
    50   adding b
    51   created new head
    51   created new head
       
    52 
       
    53   $ cd ..