Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-confused-revert.out @ 3092:25857e00af8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.
author Brendan Cully <brendan@kublai.com>
date Thu, 14 Sep 2006 19:24:00 -0700
parents 6c6c0e5595a2
children
line wrap: on
line diff
--- a/tests/test-confused-revert.out
+++ b/tests/test-confused-revert.out
@@ -17,7 +17,7 @@ foo-b
 A b
 R a
 %%% revert should fail
-abort: working dir has two parents; you must specify the revision to revert to
+abort: uncommitted merge - please provide a specific revision
 %%% revert should be ok now
 undeleting a
 forgetting b