Mercurial > hg

view tests/test-mq-merge.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 a210b40d0860
children 4b0c9c674707
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