Don't abort when backup files already exist. Don't allow alternative names. Rationale: - When the user wants to revert, he shouldn't be stopped from doing this just because some old backups will be overwritten. - To not clobber important files by accident, alternative names for backup files were disabled. As the backup target now has a fixed name, the user doesn't have to be informed about the backup copy (unless --verbose)

%%% should show a removed and b added
A b
R a
reverting...
forgetting b
undeleting a
%%% should show b unknown and a back to normal
? b
? b.orig
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
? b.orig
reverting...
forgetting b
undeleting a
%%% should show b unknown and a marked modified (merged)
? b
? b.orig
%%% should show foo-b
foo-b