Skip to content

Merge view: Result pane not aligned with input panes #590

Open

Description

@mawkler

In the merge view, the Result pane doesn't stay aligned with the Incoming/Current panes. Once the line counts differ (e.g. after a conflict or auto-merged hunk), the Result pane shows an unrelated region instead of the hunk under the cursor.

Since #557 (v4.0.4), the Result window only uses native scrollbind, which keeps the same line offset rather than the same content. Before that it was part of the structural scroll-sync group, which kept all three panes aligned. Works in v4.0.3.

Repro: :CodeDiff merge <file> on a file where one side adds lines before a later conflict, then move to that conflict in a top pane.

codediff.nvim v4.0.6-1-g23383d0, Neovim v0.12.6

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions