Mercurial > hg

comparison tests/test-rebase-bookmarks.t @ 18935:e5d9441ec281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dispatch: exit with status 1 for an InterventionRequired exception (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:17:46 -0600
parents 42b620fc89e2
children 5528c31c629c
comparison
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