Skip to content

Support three-column view for historical merge commits #424

Description

@iamhucong

Request

Support viewing a historical merge commit in a three-column view:

  • left: first parent (<merge>^1)
  • center: merge commit result (<merge>)
  • right: second parent (<merge>^2)

Use case

When reviewing a completed merge commit, it is useful to compare the merge result against both parents in one view, similar to merge commit viewers in IDEs.

Distinction from remerge-diff

This is different from git show --remerge-diff / #423.

--remerge-diff compares Git's recreated conflicted auto-merge result with the final merge result. This request is for a parent/result/parent view of the merge commit itself.

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