Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-mq-merge.out @ 4386:f9cd48bd8625

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix minor mismerge. The caching of umask ended up being duplicated.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 28 Apr 2007 17:55:45 -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