changeset 18135 | a6fe1b9cc68f |
parent 16913 | f2719b387380 |
child 18541 | 5ed6a375e9ca |
--- a/tests/test-double-merge.t Wed Dec 26 14:50:17 2012 -0800 +++ b/tests/test-double-merge.t Wed Dec 26 15:03:58 2012 -0800 @@ -30,7 +30,7 @@ unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted): - bar -> foo * + src: 'foo' -> dst: 'bar' * checking for directory renames resolving manifests overwrite: False, partial: False