Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-merge.out @ 4921:52772826e969
Automated merge with http://hg.intevation.org/mercurial/crew
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 18 Jul 2007 19:47:22 -0700 |
parents | a210b40d0860 |
children |
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 Patch queue now empty