tests/test-rebase-conflicts.t
changeset 49783 e1953a34c110
parent 48588 402a6b6173e9
child 50281 2cf264e9aa75
equal deleted inserted replaced
49782:acdb9a15137c 49783:e1953a34c110
   313   add changeset 19c888675e13
   313   add changeset 19c888675e13
   314   add changeset c1ffa3b5274e
   314   add changeset c1ffa3b5274e
   315   adding manifests
   315   adding manifests
   316   adding file changes
   316   adding file changes
   317   adding f1.txt revisions
   317   adding f1.txt revisions
   318   bundle2-input-part: total payload size 1686
   318   bundle2-input-part: total payload size 1739
   319   bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
   319   bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
   320   bundle2-input-part: total payload size 74
   320   bundle2-input-part: total payload size 74
   321   bundle2-input-part: "phase-heads" supported
   321   bundle2-input-part: "phase-heads" supported
   322   bundle2-input-part: total payload size 24
   322   bundle2-input-part: total payload size 24
   323   bundle2-input-bundle: 3 parts total
   323   bundle2-input-bundle: 3 parts total