mergetool: Don't keep temporary merge files unless told to