Add opt-in text conflict automerge#934

msexxeta wants to merge 1 commit into

opencloud-eu:mainopencloud-eu/desktop:mainfrom

msexxeta:codex/text-conflict-automergemsexxeta/desktop:codex/text-conflict-automergeCopy head branch name to clipboard