Thu, 07 Dec 2017 16:07:06 -0800 Phil Cohen overlayworkingctx: add _auditconflicts to write()
Thu, 07 Dec 2017 16:07:06 -0800 Phil Cohen overlayworkingctx: inherit from committablectx instead of workingctx
Thu, 07 Dec 2017 16:07:06 -0800 Phil Cohen overlayworkingctx: add a no-op ``clearunknown()``
Thu, 07 Dec 2017 16:07:06 -0800 Phil Cohen overlayworkingctx: add _manifest, files(), added(), removed(), modified()
Fri, 08 Dec 2017 12:14:38 -0800 Phil Cohen rebase: rerun a rebase on-disk if IMM merge conflicts arise
Thu, 07 Dec 2017 22:35:43 -0800 Phil Cohen rebase: add concludememorynode(), and call it when rebasing in-memory
Thu, 07 Dec 2017 16:07:06 -0800 Phil Cohen rebase: pass the wctx object (IMM or on-disk) to merge.update
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 tip