diff options
| author | Anthony Wang | 2022-12-30 00:20:02 +0000 |
|---|---|---|
| committer | Anthony Wang | 2022-12-30 00:20:02 +0000 |
| commit | 121be02f37a359a8fbc0d9009cf162094d3b79e8 (patch) | |
| tree | e95ec7207c8e2fffcea1cdce114273cb42139937 /custom | |
| parent | be381fe16b2189ff309f601efdab89c10fcde61d (diff) | |
| parent | ea5a752ee66f5f8dccbc058c4e1220e24e01b3e8 (diff) | |
Merge remote-tracking branch 'origin/main' into forgejo-federation
Diffstat (limited to 'custom')
| -rw-r--r-- | custom/conf/app.example.ini | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index d77936f25..d9a094b2b 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1036,6 +1036,9 @@ ROUTER = console ;; ;; Add co-authored-by and co-committed-by trailers if committer does not match author ;ADD_CO_COMMITTER_TRAILERS = true +;; +;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply +;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |