Increase conflict marker size to avoid false positives with git diff --check

(The conflict marker is a line of equals signs `=` which is inserted whenever there is a merge conflict)

Fixes issue #1333.