tests/test-rebase-conflicts.t

42126:ef0e3cc684b3

  bundle2-input-part: "phase-heads" supported
  bundle2-input-part: total payload size 24
  bundle2-input-bundle: 2 parts total
  updating the branch cache
  invalid branchheads cache (served): tip differs
  rebase completed

Test minimization of merge conflicts
  $ hg up -q null
  $ echo a > a

42127:70b71421fd33

  bundle2-input-part: "phase-heads" supported
  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
  rebase completed

Test minimization of merge conflicts
  $ hg up -q null
  $ echo a > a