removed diff files, new mergetool saves orig files