--- a/tests/test-rebase-brute-force.t Sat Aug 12 21:40:48 2017 -0700
+++ b/tests/test-rebase-brute-force.t Thu Aug 10 21:30:31 2017 -0700
@@ -31,8 +31,8 @@
AD: A':Z D':Z
BD: B':Z D':B'
ABD: A':Z B':Z D':B'
- CD: CRASH: revlog index out of range
- ACD: A':Z C':A'A' D':Z
+ CD: ABORT: cannot use revision 3 as base, result would have 3 parents
+ ACD: A':Z C':A'B D':Z
BCD: B':Z C':B'A D':B'
ABCD: A':Z B':Z C':A'B' D':B'
@@ -52,4 +52,4 @@
C: ABORT: cannot use revision 3 as base, result would have 3 parents
BC: B':Z C':B'A
AC:
- BAC: ABORT: nothing to merge
+ BAC: B':Z C':B'A