diff -r 862f6bddacce -r c7d236b55a3e tests/test-rebase-conflicts.t --- a/tests/test-rebase-conflicts.t Sun Jul 14 01:31:42 2019 -0400 +++ b/tests/test-rebase-conflicts.t Sun Jul 14 23:21:28 2019 -0700 @@ -324,8 +324,8 @@ bundle2-input-part: total payload size 24 bundle2-input-bundle: 2 parts total updating the branch cache - invalid branchheads cache (served): tip differs - invalid branchheads cache (served.hidden): tip differs + invalid branch cache (served): tip differs + invalid branch cache (served.hidden): tip differs rebase completed Test minimization of merge conflicts