don't save *.orig files from merges