Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 4656:4eeb91870d3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: fix typo
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 21 Jun 2007 00:34:14 -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)