354    conflicting 2

   354    conflicting 2

   355   branch: default

   355   branch: default

   356   commit: (clean)

   356   commit: (clean)

   357   update: 1 new changesets, 2 branch heads (merge)

   357   update: 1 new changesets, 2 branch heads (merge)

   358   phases: 4 draft

   358   phases: 4 draft

   359 

   360 

   360 test aborting a rebase succeeds after rebasing with skipped commits onto a

   361 test aborting a rebase succeeds after rebasing with skipped commits onto a

   361 public changeset (issue4896)

   362 public changeset (issue4896)

   362 

   363 

   363   $ hg init succeedonpublic

   364   $ hg init succeedonpublic

   387   warning: conflicts while merging root! (edit, then use 'hg resolve --mark')

   388   warning: conflicts while merging root! (edit, then use 'hg resolve --mark')

   388   unresolved conflicts (see hg resolve, then hg rebase --continue)

   389   unresolved conflicts (see hg resolve, then hg rebase --continue)

   389   [1]

   390   [1]

   390   $ hg rebase --abort

   391   $ hg rebase --abort

   391   rebase aborted

   392   rebase aborted