Mercurial > hg
log
| age | author | description |
|---|---|---|
| Mon, 14 Sep 2020 15:08:15 +0530 | Pulkit Goyal | tests: add some more debugmergestate calls in `test-merge-criss-cross.t` |
| Thu, 03 Sep 2020 13:58:14 +0530 | Pulkit Goyal | commit: force create a new filenode if it was set in mergestate by merge |
| Thu, 03 Sep 2020 13:44:06 +0530 | Pulkit Goyal | merge: store commitinfo if these is a dc or cd conflict |
| Fri, 25 Sep 2020 13:58:05 +0530 | Pulkit Goyal | mergestate: update _stateextras instead of reassinging |
| Mon, 14 Sep 2020 14:11:45 +0530 | Pulkit Goyal | tests: add some debugmergestate calls in `test-merge-criss-cross.t` |
| Thu, 03 Sep 2020 13:54:46 +0530 | Pulkit Goyal | tests: add few debugrevlogindex and a log call to see changes in next test |
| Mon, 14 Sep 2020 14:40:12 +0530 | Pulkit Goyal | merge: disable `m2-vs-ma` optimization if new filenode config is true |