changeset 33810 | 19f495fef0a3 |
parent 33807 | 0975506120fb |
child 33863 | 30573b3d2ebc |
--- a/tests/test-rebase-obsolete.t Mon Aug 14 07:02:38 2017 -0700 +++ b/tests/test-rebase-obsolete.t Sat Aug 12 21:01:06 2017 -0700 @@ -494,7 +494,7 @@ not rebasing ignored 4:26805aba1e60 "C" (C) not rebasing ignored 5:4b61ff5c62e2 "E" (E) rebasing 6:f15c3adaf214 "F" (F tip) - abort: cannot use revision 6 as base, result would have 3 parents + abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents [255] $ cd ..