changeset 18135 | a6fe1b9cc68f |
parent 16913 | f2719b387380 |
child 18360 | 760c0d67ce5e |
--- a/tests/test-copy-move-merge.t Wed Dec 26 14:50:17 2012 -0800 +++ b/tests/test-copy-move-merge.t Wed Dec 26 15:03:58 2012 -0800 @@ -25,8 +25,8 @@ b c all copies found (* = to merge, ! = divergent, % = renamed and deleted): - c -> a * - b -> a * + src: 'a' -> dst: 'c' * + src: 'a' -> dst: 'b' * checking for directory renames resolving manifests overwrite: False, partial: False