Commit 1506435
committed
Update
The weird disjoint `Indel`s are likely an artifact of the tree diffing
algorithm we use.various_resolve_strategies test1 parent c486637 commit 1506435
1 file changed
+42
-8
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
504 | 504 | | |
505 | 505 | | |
506 | 506 | | |
507 | | - | |
508 | | - | |
| 507 | + | |
| 508 | + | |
509 | 509 | | |
510 | 510 | | |
511 | 511 | | |
512 | | - | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
| 515 | + | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
| 519 | + | |
| 520 | + | |
513 | 521 | | |
514 | 522 | | |
515 | 523 | | |
516 | | - | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
| 527 | + | |
| 528 | + | |
| 529 | + | |
| 530 | + | |
| 531 | + | |
| 532 | + | |
| 533 | + | |
517 | 534 | | |
518 | 535 | | |
519 | 536 | | |
| |||
566 | 583 | | |
567 | 584 | | |
568 | 585 | | |
569 | | - | |
570 | | - | |
| 586 | + | |
| 587 | + | |
571 | 588 | | |
572 | 589 | | |
573 | 590 | | |
574 | | - | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
| 599 | + | |
575 | 600 | | |
576 | 601 | | |
577 | 602 | | |
578 | | - | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
| 609 | + | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
579 | 613 | | |
580 | 614 | | |
581 | 615 | | |
| |||
0 commit comments