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 not create that extra file?

Answer 1

This command should do the magic:

$ git clean -n *.orig

check is the files you want to remove are listed or not

$ git clean -f *.orig