]> git.ipfire.org Git - thirdparty/git.git/search
merge.conflictstyle: choose between "merge" and "diff3 -m" styles