Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge9.out @ 5058:a3d6de2838de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with hg-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 13:03:25 +0200
parents f191bc3916f7
children
line wrap: on
line diff
--- a/tests/test-merge9.out
+++ b/tests/test-merge9.out
@@ -5,7 +5,7 @@ adding quux2
 merging bar
 merging bar failed!
 merging foo and baz
-merging foo failed!
+merging baz failed!
 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 2