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

Function merge3_overlap_conflicts

atomic-core/src/diff/mod.rs:995–1000  ·  view source on GitHub ↗
()

Source from the content-addressed store, hash-verified

993
994 #[test]
995 fn merge3_overlap_conflicts() {
996 let base = b"anchor me\nmiddle v1\n";
997 let ours = b"anchor me\nmiddle carried v1\n";
998 let theirs = b"anchor me\n";
999 assert!(merge_text(base, ours, theirs).is_err());
1000 }
1001}

Callers

nothing calls this directly

Calls

no outgoing calls

Tested by

no test coverage detected