Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-merge.out @ 4360:d5c3a70f8422
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 | 4f721e96f1de |
children | a210b40d0860 |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b a b merging with queue at: .hg/patches.1 applying rm_a Now at: rm_a b