gistfile1.txt

[merge]
	conflictstyle = diff3
	tool = kdiff3
[mergetool]
	keepBackup = false
	keepTemporaries = false
	prompt = false

## then when you get a merge conflict, run "git mergetool" and it will run kdiff3 resolving as many conflicts automatiacyll as possible