diff --git a/tests/test-double-merge.out b/tests/test-double-merge.out --- a/tests/test-double-merge.out +++ b/tests/test-double-merge.out @@ -1,6 +1,12 @@ resolving manifests overwrite None partial False ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 + searching for copies back to rev 1 + unmatched files in other: + bar + all copies found (* = to merge, ! = divergent): + bar -> foo * + checking for directory renames foo: versions differ -> m foo: remote copied to bar -> m copying foo to bar