Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 4507:289ec1f36b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use atomictemp files to write the dirstate. atomic files are not safe in all cases.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 05 Jun 2007 19:55:27 -0300
parents bb1800a7d7e1
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
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