Mercurial > hg
log mercurial/merge.py @ 35172:a92b9f8e11ba stable 4.4.2
age | author | description |
---|---|---|
Fri, 24 Nov 2017 12:53:58 -0800 | Mark Thomas | merge: check created file dirs for path conflicts only once (issue5716) stable 4.4.2 |
Fri, 24 Nov 2017 12:53:58 -0800 | Mark Thomas | merge: cache unknown dir checks (issue5716) stable |
Tue, 24 Oct 2017 11:14:38 -0700 | Siddharth Agarwal | merge: add a config option to disable path conflict checking stable |
Wed, 04 Oct 2017 23:22:34 +0200 | muxator | update: mention long options explicitly in description of merge.update() stable |
Wed, 18 Oct 2017 22:57:15 +0200 | Gregory Szorc | fsmonitor: warn when fsmonitor could be used |
Sun, 15 Oct 2017 20:36:29 -0700 | Phil Cohen | context: add workingfilectx.markcopied |
Sun, 15 Oct 2017 20:36:29 -0700 | Phil Cohen | merge: don't use workers in in-memory mode |