Mercurial > hg
diff tests/test-histedit-fold.t @ 18934:93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 08 Feb 2013 16:27:49 -0600 |
parents | 76b69cccb07a |
children | e5d9441ec281 |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Fri Feb 08 16:27:59 2013 -0600 +++ b/tests/test-histedit-fold.t Fri Feb 08 16:27:49 2013 -0600 @@ -182,7 +182,7 @@ merging file warning: conflicts during merge. merging file incomplete! (edit conflicts, then use 'hg resolve --mark') - abort: Fix up the change and run hg histedit --continue + Fix up the change and run hg histedit --continue [255] There were conflicts, we keep P1 content. This should effectively drop the changes from +6. @@ -247,7 +247,7 @@ merging file warning: conflicts during merge. merging file incomplete! (edit conflicts, then use 'hg resolve --mark') - abort: Fix up the change and run hg histedit --continue + Fix up the change and run hg histedit --continue [255] $ cat > file << EOF > 1