changeset 18362 | 5a4f220fbfca |
parent 18360 | 760c0d67ce5e |
child 18541 | 5ed6a375e9ca |
--- a/tests/test-copy-move-merge.t Tue Jan 15 02:59:12 2013 +0100 +++ b/tests/test-copy-move-merge.t Wed Dec 12 02:38:14 2012 +0100 @@ -25,8 +25,8 @@ b c all copies found (* = to merge, ! = divergent, % = renamed and deleted): + src: 'a' -> dst: 'b' * src: 'a' -> dst: 'c' * - src: 'a' -> dst: 'b' * checking for directory renames resolving manifests overwrite: False, partial: False