diff options
Diffstat (limited to 'tests/test-double-merge.t')
| -rw-r--r-- | tests/test-double-merge.t | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/test-double-merge.t b/tests/test-double-merge.t index a703c5b..06c0f65 100644 --- a/tests/test-double-merge.t +++ b/tests/test-double-merge.t @@ -29,12 +29,12 @@ we get conflicts that shouldn't be there searching for copies back to rev 1 unmatched files in other: bar - all copies found (* = to merge, ! = divergent, % = renamed and deleted): + all copies found (* = to merge, ! = divergent): bar -> foo * checking for directory renames resolving manifests - overwrite: False, partial: False - ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 + overwrite None partial False + ancestor e6dc8efe11cc local 6a0df1dad128+ remote 484bf6903104 foo: versions differ -> m foo: remote copied to bar -> m preserving foo for resolve of bar @@ -63,5 +63,3 @@ contents of bar line 0 line 1 line 2-2 - - $ cd .. |