Mercurial > hg
log
| age | author | description |
|---|---|---|
| Wed, 26 Aug 2020 16:37:23 +0530 | Pulkit Goyal | merge: update commitinfo from all mergeresults during bid merge |
| Mon, 24 Aug 2020 17:22:28 +0530 | Pulkit Goyal | merge: add missing ACTION_KEEP when both remote and ancestor are not present |
| Mon, 24 Aug 2020 15:20:09 +0530 | Pulkit Goyal | merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally |
| Tue, 01 Sep 2020 17:08:26 +0530 | Pulkit Goyal | merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent |
| Mon, 14 Sep 2020 13:51:39 +0530 | Pulkit Goyal | mergeresult: introduce dedicated tuple for no-op actions |
| Fri, 19 Jun 2020 13:27:46 +0200 | Pierre-Yves David | tests: add criss cross merging tests whose behavior need to be fixed |
| Fri, 11 Sep 2020 15:52:06 -0700 | Kyle Lippincott | repo: avoid copying/updating a dict on every `repo.__getitem__` |