Mercurial > hg

view tests/test-merge4.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 b2ae81a7df29
children 4b0c9c674707
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)