(result: &ThreeWayResult)
| 426 | // ---- Helpers ---------------------------------------------------------- |
| 427 | |
| 428 | fn merged_string(result: &ThreeWayResult) -> Option<String> { |
| 429 | match result { |
| 430 | ThreeWayResult::Merged(bytes) => Some(String::from_utf8_lossy(bytes).into_owned()), |
| 431 | ThreeWayResult::Conflict => None, |
| 432 | } |
| 433 | } |
| 434 | |
| 435 | // ---- Basic merge cases ------------------------------------------------ |
| 436 |
nothing calls this directly
no outgoing calls
no test coverage detected