changeset 32268 | 24f55686a63d |
parent 32267 | c2380b448265 |
child 33032 | 8e3021fd1a44 |
--- a/tests/test-rebase-conflicts.t Tue May 02 22:27:44 2017 +0200 +++ b/tests/test-rebase-conflicts.t Tue May 02 18:57:52 2017 +0200 @@ -306,9 +306,7 @@ bundle2-input-bundle: 0 parts total updating the branch cache invalid branchheads cache (served): tip differs - history modification detected - truncating revision branch cache to revision 9 rebase completed - truncating cache/rbc-revs-v1 to 72 Test minimization of merge conflicts $ hg up -q null