log

age author description
Tue, 02 Mar 2021 00:05:22 +0100 Pierre-Yves David test-copies: add a test updating file content while merging a pure overwrite
Wed, 10 Mar 2021 13:08:41 +0530 Pulkit Goyal mergestate: don't pop stateextras when there are no conflicts on filemerge