When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to
*.orig
git config --global mergetool.keepBackup false
This should work for Beyond Compare (as mergetool) too