tests/test-rebase-bookmarks.t
changeset 45826 21733e8c924f
parent 45796 e9555305c5c6
equal deleted inserted replaced
45825:8f07f5a9c3de 45826:21733e8c924f
   171   $ hg rebase --dest 4
   171   $ hg rebase --dest 4
   172   rebasing 3:3d5fa227f4b5 Y Z "C"
   172   rebasing 3:3d5fa227f4b5 Y Z "C"
   173   merging c
   173   merging c
   174   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   174   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   175   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   175   unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
   176   [1]
   176   [240]
   177   $ echo 'c' > c
   177   $ echo 'c' > c
   178   $ hg resolve --mark c
   178   $ hg resolve --mark c
   179   (no more unresolved files)
   179   (no more unresolved files)
   180   continue: hg rebase --continue
   180   continue: hg rebase --continue
   181   $ hg rebase --continue
   181   $ hg rebase --continue