prevent autoresolution of merge conflicts for kdiff3

Conflicts:
	gitconfig