Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change.out @ 3407: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
comparison
equal deleted inserted replaced
3399:5dbb3a991bbf 3407:d2b55e3c4e25
131 requesting all changes 131 requesting all changes
132 adding changesets 132 adding changesets
133 adding manifests 133 adding manifests
134 adding file changes 134 adding file changes
135 added 1 changesets with 1 changes to 1 files 135 added 1 changesets with 1 changes to 1 files
136 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 136 1 files updated, 0 files merged, 0 files removed, 0 files unresolved