tests/test-merge-commit.t
changeset 34661 eb586ed5d8ce
parent 28318 564a354f7f35
child 37282 009d0283de5f
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   102   $ hg clone -U -r 1 -r 2 a b
   102   $ hg clone -U -r 1 -r 2 a b
   103   adding changesets
   103   adding changesets
   104   adding manifests
   104   adding manifests
   105   adding file changes
   105   adding file changes
   106   added 3 changesets with 3 changes to 2 files (+1 heads)
   106   added 3 changesets with 3 changes to 2 files (+1 heads)
       
   107   new changesets 2665aaee66e9:0f2ff26688b9
   107   $ cd b
   108   $ cd b
   108 
   109 
   109   $ hg up -C 1
   110   $ hg up -C 1
   110   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   111   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   111 
   112