Mercurial > public > mercurial-scm > hg
log mercurial/merge.py @ 34130:ada8a19672ab
age | author | description |
---|---|---|
Mon, 11 Sep 2017 13:17:43 -0700 | Phil Cohen | merge: flush any deferred writes just before recordupdates() |
Mon, 11 Sep 2017 13:03:27 -0700 | Phil Cohen | merge: flush any deferred writes before, and after, running any workers |
Mon, 11 Sep 2017 13:03:27 -0700 | Phil Cohen | merge: pass wctx to premerge, filemerge |
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 |
Thu, 06 Jul 2017 16:29:31 -0700 | Gregory Szorc | sparse: refactor update actions filtering and call from core |