Julien Calixte 3a528c63e0 feat(notes): add line-level three-way merge util
Wraps node-diff3 to merge two edits derived from a common ancestor.
Conservative by design: edits to immediately-adjacent lines are
reported as conflicts so the caller can fall back to manual resolution
rather than risk a wrong auto-merge.
2026-06-30 00:26:59 +02:00
2026-06-14 19:49:10 +02:00
2023-08-15 01:07:50 +02:00
2021-03-09 22:00:10 +01:00
2026-05-02 22:48:10 +02:00
2026-03-28 20:24:08 +01:00
2026-02-15 08:00:11 +01:00
2026-03-28 09:38:55 +01:00
2026-03-28 09:34:04 +01:00
2026-03-28 09:38:55 +01:00
2026-05-13 18:38:54 +02:00
2026-03-28 09:34:04 +01:00
2026-03-28 09:38:55 +01:00
2026-03-28 09:38:55 +01:00
2026-03-17 01:02:24 +01:00
2026-03-28 20:24:08 +01:00
2026-06-06 22:13:14 +02:00
Description
No description provided
Readme 8.4 MiB
Languages
TypeScript 52.6%
Vue 44.3%
CSS 1.8%
JavaScript 1%
HTML 0.2%
Other 0.1%