Mercurial > hg-stable
graph
-
merge: add missing ACTION_KEEP when both remote and ancestor are not presentMon, 24 Aug 2020 17:22:28 +0530, by Pulkit Goyal
-
merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locallyMon, 24 Aug 2020 15:20:09 +0530, by Pulkit Goyal
-
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absentTue, 01 Sep 2020 17:08:26 +0530, by Pulkit Goyal
-
mergeresult: introduce dedicated tuple for no-op actionsMon, 14 Sep 2020 13:51:39 +0530, by Pulkit Goyal
-
tests: add criss cross merging tests whose behavior need to be fixedFri, 19 Jun 2020 13:27:46 +0200, by Pierre-Yves David
-
repo: avoid copying/updating a dict on every `repo.__getitem__`Fri, 11 Sep 2020 15:52:06 -0700, by Kyle Lippincott