MCPcopy Create free account
hub / github.com/atomicdotdev/atomic / merged_string

Function merged_string

atomic-core/src/merge/three_way.rs:428–433  ·  view source on GitHub ↗
(result: &ThreeWayResult)

Source from the content-addressed store, hash-verified

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

Callers

nothing calls this directly

Calls

no outgoing calls

Tested by

no test coverage detected