Mercurial > public > mercurial-scm > hg

diff tests/test-up-local-change.out @ 3400:d2b55e3c4e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents b16456909a0a
children 41989e55fa37
line wrap: on
line diff
--- a/tests/test-up-local-change.out	Sun Oct 15 21:09:56 2006 +0200
+++ b/tests/test-up-local-change.out	Sun Oct 15 16:18:09 2006 -0500
@@ -133,4 +133,4 @@
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved