tests/test-rebase-bookmarks.t
changeset 18935 e5d9441ec281
parent 18933 42b620fc89e2
child 19641 5528c31c629c
equal deleted inserted replaced
18934:93f3a06b2035 18935:e5d9441ec281
   140   $ hg rebase
   140   $ hg rebase
   141   merging c
   141   merging c
   142   warning: conflicts during merge.
   142   warning: conflicts during merge.
   143   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
   143   merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
   144   unresolved conflicts (see hg resolve, then hg rebase --continue)
   144   unresolved conflicts (see hg resolve, then hg rebase --continue)
   145   [255]
   145   [1]
   146   $ echo 'c' > c
   146   $ echo 'c' > c
   147   $ hg resolve --mark c
   147   $ hg resolve --mark c
   148   $ hg rebase --continue
   148   $ hg rebase --continue
   149   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
   149   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
   150   $ hg tglog
   150   $ hg tglog