Make manual merge autodetection optional and add manual merge as merge method#12543
Merged
techknowlogick merged 34 commits intogo-gitea:masterfrom Mar 4, 2021
Commits
Commits on Aug 20, 2020
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Aug 21, 2020
Commits on Aug 22, 2020
- committed
- committed
- committed
- committed
Commits on Aug 23, 2020
- committed
- committed
- committed
Commits on Aug 24, 2020
- committed
- authored
- committed
Commits on Oct 23, 2020
Commits on Jan 25, 2021
- committed
- committed
- committed
- committed
