add .orig to .gitignore, that is produced by git mergetool