Fri, 19 Mar 2021 23:51:46 +0100 | Joerg Sonnenberger | tests: resort to fix test with newer git versions | changeset | files |
Fri, 19 Mar 2021 23:34:29 +0100 | Joerg Sonnenberger | git: fix missing case from 6266d19556ad (introduction of nodeconstants) | changeset | files |
Thu, 18 Mar 2021 18:24:59 -0400 | Matt Harbison | merge with stable | changeset | files |
Tue, 02 Mar 2021 00:05:22 +0100 | Pierre-Yves David | test-copies: add a test updating file content while merging a pure overwrite | changeset | files |
Wed, 10 Mar 2021 13:08:41 +0530 | Pulkit Goyal | mergestate: don't pop stateextras when there are no conflicts on filemerge | changeset | files |
Wed, 13 Jan 2021 16:14:58 +0100 | Joerg Sonnenberger | node: introduce nodeconstants class | changeset | files |