Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge8.out @ 4311:4787e2b0dd03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a bug where copies were ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:43:18 -0500
parents 9103dab96093
children bb1800a7d7e1
line wrap: on
line diff
--- a/tests/test-merge8.out
+++ b/tests/test-merge8.out
@@ -6,4 +6,5 @@ adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
 (run 'hg update' to get a working copy)
-1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+merging a and b
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved