Tidy up git mergetool's backup file behaviour