tests/test-merge-commit.t
branchstable
changeset 12847 b00eda50ad2b
parent 12328 b63f6422d2a7
child 14182 ec5886db9dc6
equal deleted inserted replaced
12846:4b334f8c941b 12847:b00eda50ad2b
    98 Same thing, but with the merge on 3 having the rename
    98 Same thing, but with the merge on 3 having the rename
    99 on the remote parent:
    99 on the remote parent:
   100 
   100 
   101   $ cd ..
   101   $ cd ..
   102   $ hg clone -U -r 1 -r 2 a b
   102   $ hg clone -U -r 1 -r 2 a b
   103   requesting all changes
       
   104   adding changesets
   103   adding changesets
   105   adding manifests
   104   adding manifests
   106   adding file changes
   105   adding file changes
   107   added 3 changesets with 3 changes to 2 files (+1 heads)
   106   added 3 changesets with 3 changes to 2 files (+1 heads)
   108   $ cd b
   107   $ cd b