Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rebase-conflicts.t
changeset 42602 c7d236b55a3e
parent 42532 12243f15d53e
child 42897 d7304434390f
equal deleted inserted replaced
42601:862f6bddacce 42602:c7d236b55a3e 
   322   truncating cache/rbc-revs-v1 to 56
 
   322   truncating cache/rbc-revs-v1 to 56
 
   323   bundle2-input-part: "phase-heads" supported
 
   323   bundle2-input-part: "phase-heads" supported
 
   324   bundle2-input-part: total payload size 24
 
   324   bundle2-input-part: total payload size 24
 
   325   bundle2-input-bundle: 2 parts total
 
   325   bundle2-input-bundle: 2 parts total
 
   326   updating the branch cache
 
   326   updating the branch cache
 
   327   invalid branchheads cache (served): tip differs
 
   327   invalid branch cache (served): tip differs
 
   328   invalid branchheads cache (served.hidden): tip differs
 
   328   invalid branch cache (served.hidden): tip differs
 
   329   rebase completed
 
   329   rebase completed
 
   330 
   330 
   331 Test minimization of merge conflicts
 
   331 Test minimization of merge conflicts
 
   332   $ hg up -q null
 
   332   $ hg up -q null
 
   333   $ echo a > a
 
   333   $ echo a > a
mercurial