diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-01-14 21:04:27 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2021-01-14 21:04:27 +0300 |
| commit | 6018a51d472bbf5e4675b9720474f15469fd1c0d (patch) | |
| tree | 4bcf63106c5e9ee1aa27a48ac13c6bd5538a1bb5 /doc/README.md | |
| parent | b12fd1b88b4f2a9f43c3e96713bd7ade980e46a6 (diff) | |
| parent | 5ab04947877a3ab6d72ba6faafd5d8cd0b11baeb (diff) | |
Merge branch 'po-resolve-conflicts-featureflag-removal' into 'master'
Enable Go version of ResolveConflicts by default
Closes #3289
See merge request gitlab-org/gitaly!3007
Diffstat (limited to 'doc/README.md')
0 files changed, 0 insertions, 0 deletions