Ignore ".orig" backup of merge conflict files