()
| 444 | |
| 445 | #[test] |
| 446 | fn test_only_left_changes() { |
| 447 | let base = tokenize(b"x = 1"); |
| 448 | let left = tokenize(b"x = 2"); |
| 449 | let right = tokenize(b"x = 1"); |
| 450 | let result = three_way_merge(&base, &left, &right); |
| 451 | assert!(matches!(result, ThreeWayResult::Merged(_))); |
| 452 | assert_eq!(merged_string(&result).unwrap(), "x = 2"); |
| 453 | } |
| 454 | |
| 455 | #[test] |
| 456 | fn test_only_right_changes() { |
nothing calls this directly
no test coverage detected