3a528c63e0a6d82c73581f20ee95ef23e90b8267
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.
Description
Languages
TypeScript
52.6%
Vue
44.3%
CSS
1.8%
JavaScript
1%
HTML
0.2%
Other
0.1%