Fri, 19 Mar 2021 23:51:46 +0100 Joerg Sonnenberger tests: resort to fix test with newer git versions
Fri, 19 Mar 2021 23:34:29 +0100 Joerg Sonnenberger git: fix missing case from 6266d19556ad (introduction of nodeconstants)
Thu, 18 Mar 2021 18:24:59 -0400 Matt Harbison merge with stable
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
Wed, 13 Jan 2021 16:14:58 +0100 Joerg Sonnenberger node: introduce nodeconstants class
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip