Mercurial > hg

diff tests/test-merge8.out @ 4416:bb1800a7d7e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 02:59:13 -0500
parents 4787e2b0dd03
children 0750f11152fe
line wrap: on
line diff
--- a/tests/test-merge8.out	Tue May 08 02:57:05 2007 -0500
+++ b/tests/test-merge8.out	Tue May 08 02:59:13 2007 -0500
@@ -6,5 +6,4 @@
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
-merging a and b
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved