Mercurial > hg

diff tests/test-merge-default.out @ 6723:1fe6f365df2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: only in-branch merges can be implicit
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 15:02:52 +0200
parents 4b0c9c674707
children 50b6af595e0c
line wrap: on
line diff
--- a/tests/test-merge-default.out	Mon Jun 23 15:03:22 2008 +0200
+++ b/tests/test-merge-default.out	Mon Jun 23 15:02:52 2008 +0200
@@ -5,10 +5,10 @@
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because not at a head
-abort: repo has 3 heads - please merge with an explicit rev
+abort: branch 'default' has 3 heads - please merge with an explicit rev
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because > 2 heads
-abort: repo has 3 heads - please merge with an explicit rev
+abort: branch 'default' has 3 heads - please merge with an explicit rev
 % should succeed
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)