andras/reconcile
andras/reconcile
Watch
1
0
Fork
You've already forked reconcile
 0
Code Issues Pull requests 10 Projects Releases Packages Wiki Activity Actions

.
All checks were successful
Check / build (pull_request) Successful in 9m54s
Details

Browse source
This commit is contained in:
Andras Schmelczer 2026-10-27 15:31:31 +00:00
commit b4259b767c
1 changed files with 608 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/examples/replacing.yml
View file

@ -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