328   bundle2-input-part: "phase-heads" supported

   328   bundle2-input-part: "phase-heads" supported

   329   bundle2-input-part: total payload size 24

   329   bundle2-input-part: total payload size 24

   330   bundle2-input-bundle: 2 parts total

   330   bundle2-input-bundle: 2 parts total

   331   updating the branch cache

   331   updating the branch cache

   332   invalid branchheads cache (served): tip differs

   332   invalid branchheads cache (served): tip differs

   333   rebase completed

   334   rebase completed

   334 

   335 

   335 Test minimization of merge conflicts

   336 Test minimization of merge conflicts

   336   $ hg up -q null

   337   $ hg up -q null

   337   $ echo a > a

   338   $ echo a > a