tests/test-mq-merge.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 15 Mar 2008 22:03:18 -0300
changeset 6282 709652cd7bff
parent 4437 a210b40d0860
child 6336 4b0c9c674707
permissions -rw-r--r--
test-mv-cp-st-diff: avoid linkrev collisions The copy detection code relies heavily on the linkrevs, so it's better to avoid collisions in this test.

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