Mercurial > hg-stable

diff tests/test-merge9.out @ 6512:368a4ec603cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents 4b0c9c674707
children 92ccccb55ba3
line wrap: on
line diff
--- a/tests/test-merge9.out	Thu Apr 10 14:25:50 2008 +0200
+++ b/tests/test-merge9.out	Thu Apr 10 15:02:24 2008 -0500
@@ -5,7 +5,7 @@
 created new head
 merging bar
 merging bar failed!
-merging foo and baz
+merging foo and baz to baz
 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 2
@@ -13,7 +13,7 @@
 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging bar
 merging bar failed!
-merging baz and foo
+merging baz and foo to baz
 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
 There are unresolved merges, you can redo the full merge using:
   hg update -C 1