Git mergetool generates unwanted .orig files

Question

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

Answer 1

Windows:

1. in File Win/Users/HOME/.gitconfig set mergetool.keepTemporaries=false
2. in File git/libexec/git-core/git-mergetool, in the function cleanup_temp_files() add rm -rf -- "$MERGED.orig" within the else block.