Mercurial > hg-stable
diff tests/test-rebase-check-restore.t @ 18933:42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 08 Feb 2013 16:27:59 -0600 |
parents | f2719b387380 |
children | e5d9441ec281 |
line wrap: on
line diff
--- a/tests/test-rebase-check-restore.t Fri Feb 08 16:28:24 2013 -0600 +++ b/tests/test-rebase-check-restore.t Fri Feb 08 16:27:59 2013 -0600 @@ -69,7 +69,7 @@ merging A warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') - abort: unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Solve the conflict and go on: @@ -122,7 +122,7 @@ merging A warning: conflicts during merge. merging A incomplete! (edit conflicts, then use 'hg resolve --mark') - abort: unresolved conflicts (see hg resolve, then hg rebase --continue) + unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Solve the conflict and go on: