added preference to remove .orig from mergetool