Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-confused-revert.out @ 2030:8d9ec30d58bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 31 Mar 2006 10:52:56 -0800
parents d436b21b20dc
children c9226bcc288d
line wrap: on
line diff
--- a/tests/test-confused-revert.out
+++ b/tests/test-confused-revert.out
@@ -2,24 +2,24 @@
 A b
 R a
 reverting...
-saving current version of b as b.bak
+saving current version of b as b.orig
 forgetting b
 undeleting a
 %%% should show b unknown and a back to normal
 ? b
-? b.bak
+? b.orig
 merging a
 %%% should show foo-b
 foo-b
 %%% should show a removed and b added
 A b
 R a
-? b.bak
+? b.orig
 reverting...
 forgetting b
 undeleting a
 %%% should show b unknown and a marked modified (merged)
 ? b
-? b.bak
+? b.orig
 %%% should show foo-b
 foo-b