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
I simply use the command
git clean -n *.orig
check to make sure only file I want remove are listed then
git clean -f *.orig