diff options
Diffstat (limited to 'tests/test-copy-move-merge.t')
| -rw-r--r-- | tests/test-copy-move-merge.t | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t index cc64b4c..d5fbb8e 100644 --- a/tests/test-copy-move-merge.t +++ b/tests/test-copy-move-merge.t @@ -24,13 +24,13 @@ unmatched files in other: b c - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): c -> a * b -> a * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 + overwrite None partial False + ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6 a: remote moved to c -> m a: remote moved to b -> m preserving a for resolve of b @@ -60,5 +60,3 @@ file c 0 1 2 - - $ cd .. |