Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 3002:a31557193f3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify working dir manifest generation
author Matt Mackall <mpm@selenic.com>
date Tue, 22 Aug 2006 17:08:38 -0500
parents fb493241d7f6
children 87a0332ab58b
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -137,4 +137,5 @@ adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved