Diff viewer

Orca's diff viewer is designed for serious review of AI-generated code — not a quick glance. Every worktree has a built-in diff against its start-from ref.

Features

• Combined diff across all staged, unstaged, and untracked files.
• Line numbers for both sides, toggleable.
• Image diffs — side-by-side, swipe, and onion-skin modes for binary images.
• Merge-conflict UI with three-way view and inline resolution.
• Staging by hunk or line — same as git add -p but visual.

When you open a diff for the first time (no cached scroll position, no comment to jump to), Orca scrolls straight to the first change and centers it in the viewport. Reopening a diff you've already scrolled in restores your last position; explicit jumps to a comment still win over both.

Scoping

The diff shows changes against the worktree's start-from ref by default. You can switch to comparing against any commit, branch, or the base ref from the diff toolbar.

Keyboard shortcuts

• j / k — next / previous changed file.
• n / p — next / previous hunk.
• s — stage the hunk under the cursor.
• c — start a comment (Annotate AI Diff).