Don't want .orig backups of the marked up conflicting file. Don't trust kdiff3's exit code