Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-mq-merge.out @ 5335:88e931f74e8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert_git: avoid returning two entries for the same file in getchanges This could happen in merge changesets if the merged file was different from both parents.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 24 Sep 2007 19:00:11 -0300
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