Deleted merge file
Mergetool no longer keeps backups

Changed the keepbackup option for mergetool, this stops *.orig files
being left in the project.