21 lines
660 B
YAML
21 lines
660 B
YAML
# Both replaced one token but the tokens are different
|
|
parent: original_1 original_2 original_3
|
|
left: original_1 edit_1| original_3
|
|
right: original_1 original_2| edit_2
|
|
expected: original_1 edit_1|| edit_2
|
|
|
|
---
|
|
|
|
# Both replace the same token with the same value
|
|
parent: original_1 original_2 original_3
|
|
left: original_1 edit_1| original_3
|
|
right: original_1 edit_1 original_3|
|
|
expected: original_1 edit_1| original_3|
|
|
|
|
---
|
|
|
|
# Both replace the same token with different value
|
|
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
|