()
| 454 | |
| 455 | #[test] |
| 456 | fn test_only_right_changes() { |
| 457 | let base = tokenize(b"x = 1"); |
| 458 | let left = tokenize(b"x = 1"); |
| 459 | let right = tokenize(b"x = 2"); |
| 460 | let result = three_way_merge(&base, &left, &right); |
| 461 | assert!(matches!(result, ThreeWayResult::Merged(_))); |
| 462 | assert_eq!(merged_string(&result).unwrap(), "x = 2"); |
| 463 | } |
| 464 | |
| 465 | #[test] |
| 466 | fn test_non_overlapping_token_edits() { |
nothing calls this directly
no test coverage detected