Steve Yegge 05304e3ab1 Merge origin/main, fix test git init for modern git

2025-12-27 00:17:36 -08:00

..

syncbranch_test.go

bd sync: 2025-12-23 23:38:57

2025-12-24 00:06:41 -08:00

syncbranch.go

…

worktree_divergence_test.go

fix: use content-level merge for divergence recovery (bd-kpy)

2025-12-24 22:41:40 -08:00

worktree_helpers_test.go

bd sync: 2025-12-23 23:38:57

2025-12-24 00:06:41 -08:00

worktree_path_test.go

…

worktree_sync_test.go

Merge origin/main, fix test git init for modern git

2025-12-27 00:17:36 -08:00

worktree.go

fix: use content-level merge for divergence recovery (bd-kpy)

2025-12-24 22:41:40 -08:00