Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new merge conflicts menu and move the previous external merge tool there #3477

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new merge conflicts menu and move the previous external merge tool there #3477

wants to merge 1 commit into from

Commits on Apr 5, 2024

  1. Add new merge conflicts menu and move the previous external merge too… 

    …l there

Also add options for `git checkout --theirs` and `git checkout --ours`

Fixes jesseduffield#2026
    @recht
    recht committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    48c88f9 View commit details
    Browse the repository at this point in the history