changeset 42127 | 70b71421fd33 |
parent 39497 | 89630d0b3e23 |
child 42209 | 91a0bc50b288 |
--- a/tests/test-rebase-conflicts.t Mon May 21 17:28:35 2018 +0200 +++ b/tests/test-rebase-conflicts.t Thu Apr 04 13:58:49 2019 +0200 @@ -330,6 +330,7 @@ bundle2-input-bundle: 2 parts total updating the branch cache invalid branchheads cache (served): tip differs + invalid branchheads cache (served.hidden): tip differs rebase completed Test minimization of merge conflicts