Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge2.out @ 4360:d5c3a70f8422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
polish the simplemerge command; add a test
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents b2ae81a7df29
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b