tests/test-rebase-parameters.t
changeset 44347 9c9cfecd4600
parent 44239 830eae18b2f3
child 44555 05654ea5137c
equal deleted inserted replaced
44346:b42ce825308e 44347:9c9cfecd4600
   479   [1]
   479   [1]
   480 
   480 
   481   $ hg summary
   481   $ hg summary
   482   parent: 1:56daeba07f4b 
   482   parent: 1:56daeba07f4b 
   483    c2
   483    c2
   484   parent: 2:e4e3f3546619 tip
       
   485    c2b
       
   486   branch: default
   484   branch: default
   487   commit: 1 modified, 1 unresolved (merge)
   485   commit: 1 unresolved (clean)
   488   update: (current)
   486   update: 1 new changesets, 2 branch heads (merge)
   489   phases: 3 draft
   487   phases: 3 draft
   490   rebase: 0 rebased, 1 remaining (rebase --continue)
   488   rebase: 0 rebased, 1 remaining (rebase --continue)
   491 
   489 
   492   $ hg resolve -l
   490   $ hg resolve -l
   493   U c2
   491   U c2