changeset 8748 | f325574dad1a |
parent 6512 | 368a4ec603cc |
child 8753 | af5f099d932b |
--- a/tests/test-issue672.out Mon Jun 08 18:14:44 2009 -0500 +++ b/tests/test-issue672.out Mon Jun 08 18:14:44 2009 -0500 @@ -29,7 +29,7 @@ all copies found (* = to merge, ! = divergent): 1a -> 1 * checking for directory renames - 1a: local moved to 1 -> m + 1a: local copied/moved to 1 -> m preserving 1a for resolve of 1a picked tool 'internal:merge' for 1a (binary False symlink False) merging 1a and 1 to 1a