Avoid orphaned .orig files after resolving conflicts from a Git merge

It’s the git mergetool that produces these files, you can disable them with this command:

git config --global mergetool.keepBackup false

See the git-config manpage:

http://man.he.net/man1/git-config