log

age author description
Mon, 24 Aug 2020 15:35:34 +0530 Pulkit Goyal merge: store cases when a file is absent post merge in commitinfo
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`