Mercurial > hg

diff tests/test-convert-hg-source.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 8e7130a10f3b
line wrap: on
line diff
--- a/tests/test-convert-hg-source.out	Thu Apr 10 14:25:50 2008 +0200
+++ b/tests/test-convert-hg-source.out	Thu Apr 10 15:02:24 2008 -0500
@@ -1,9 +1,9 @@
 created new head
-merging baz and foo
+merging baz and foo to baz
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-merging foo and baz
+merging foo and baz to baz
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 created new head