Steve Yegge 8e6462d44c test(merge): add test for both sides adding same dependency ...

Ensures no duplicates when left and right independently add the same
dependency (not in base). Left version is preferred.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

2025-12-18 23:24:31 -08:00

..

merge_test.go

test(merge): add test for both sides adding same dependency

2025-12-18 23:24:31 -08:00

merge.go

fix(merge): proper 3-way merge for dependencies - removals win (bd-ndye)

2025-12-18 23:20:49 -08:00