I use the git mergetool for handling merge conflicts. The tool leaves `.orig` files as backups to the original files. These files make `git status` complain about untracked files and, in my case, highlights this in the terminal.