.gitconfig/merge.ff = false