Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 4317:66249be9aa23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-bad-pull: try to avoid timing-related failures
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 07 Apr 2007 04:27:55 -0300
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)