log mercurial/merge.py @ 34037:65ae54582713

age author description
Thu, 31 Aug 2017 11:28:59 -0700 Phil Cohen merge: move some of the logic in batchget() to workingfilectx
Fri, 14 Jul 2017 19:27:28 +0000 Alex Gaynor merge: removed sorting in casefolding detection, for a slight performance win
Fri, 14 Jul 2017 14:22:40 -0700 Jun Wu codemod: register core configitems using a script