Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert.out @ 2036:c9226bcc288d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 01 Apr 2006 11:58:50 +0200
parents 8d9ec30d58bc
children b2ae81a7df29
line wrap: on
line diff
--- a/tests/test-merge-revert.out
+++ b/tests/test-merge-revert.out
@@ -3,7 +3,6 @@ 0:eb43f19ff115
 016807e6fdaf tip
 eb43f19ff115
 eb43f19ff115+
-saving current version of file1 as file1.orig
 reverting file1
 ? file1.orig
 eb43f19ff115