Conflicts on the union lines only: CHANGELOG Unreleased (both orders' entries kept), CLAUDE.md (/trekexecute row from A, /trekreview row from B), tests/fixtures/jsonl-schemas.md (trekplan line_ref from B, trekexecute line_ref from A). Suite on the merged tree 2682 (2680/0/2). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| commands | ||
| fixtures | ||
| helpers | ||
| hooks | ||
| integration | ||
| lib | ||
| parsers | ||
| review | ||
| scripts | ||
| synthetic | ||
| validators | ||
| e2e-critic-diff-mode.sh | ||
| e2e-files-trial4.sh | ||