This commit is contained in:
parent
a2fbba682e
commit
b4259b767c
3 changed files with 608 additions and 24 deletions
|
|
@ -21,4 +21,4 @@ expected: a b c d
|
|||
parent: a
|
||||
left: abc
|
||||
right: abcd
|
||||
expected: abcabcd
|
||||
expected: abcd
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ expected: original_1 edit_1| original_3|
|
|||
parent: original_1 original_2 original_3
|
||||
left: original_1 edit_1| original_3
|
||||
right: original_1 conflicting_edit_1| original_3
|
||||
expected: original_1 conflicting_edit_1| edit_1| original_3
|
||||
expected: original_1 conflicting_edit_1|| original_3
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ expected: Please submit your |completed |assignment |online |by Friday
|
|||
parent: "a b "
|
||||
left: "c d "
|
||||
right: "a b c d "
|
||||
expected: "c d c d "
|
||||
expected: "a b c d "
|
||||
|
||||
---
|
||||
parent: a b c d e
|
||||
|
|
|
|||
Loading…
Reference in a new issue