Steve Yegge 14b2d3431f Add comprehensive tests for 3-way merge functionality ...

- Added merge_test.go with 797 lines of test coverage
- Tests for field merging, dependency merging, timestamp handling
- Tests for deletion detection and conflict generation
- Integration tests for merge driver auto-config in bd init
- Test helpers for git repository setup

Closes bd-kazt

All tests pass: go test ./internal/merge/... -v

Amp-Thread-ID: https://ampcode.com/threads/T-f0fe7c4c-13e7-486b-b073-fc64b81eeb4b
Co-authored-by: Amp <amp@ampcode.com>

2025-11-06 15:51:40 -08:00

..

merge_test.go

Add comprehensive tests for 3-way merge functionality

2025-11-06 15:51:40 -08:00

merge.go

Fix linting errors in vendored merge code

2025-11-06 15:41:36 -08:00