Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge8.out @ 4386:f9cd48bd8625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix minor mismerge. The caching of umask ended up being duplicated.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -0300
parents 4787e2b0dd03
children bb1800a7d7e1
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)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved