Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Oct 2006 18:01:25 -0300
changeset 3418 7012c889e8f2
parent 2175 b2ae81a7df29
permissions -rw-r--r--
portability fixes for some tests Apparently the ls on OS X 10.3.9 exits with success even if the file given on the command line doesn't exist

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)
mercurial-crew-with-dirclash