`clash check` - medium: include diffs from conflicting worktrees

[mathew55]

Extend clash check output to include the actual diff of the conflicting file from the other worktree.

When a conflict is detected, the agent needs to know what the other worktree changed to adapt its approach. Include the diff (other worktree vs merge-base) for the conflicting file.

Depends on: #2