tests/test-merge8.t
changeset 16913 f2719b387380
parent 11981 518b90d66fad
child 34661 eb586ed5d8ce
equal deleted inserted replaced
16912:6ef3107c661e 16913:f2719b387380
    23   adding file changes
    23   adding file changes
    24   added 2 changesets with 2 changes to 1 files
    24   added 2 changesets with 2 changes to 1 files
    25   (run 'hg update' to get a working copy)
    25   (run 'hg update' to get a working copy)
    26   $ hg update
    26   $ hg update
    27   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
    27   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
    28 
       
    29   $ cd ..