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

Use three-way diffs for merge conflicts #45

Merged
merged 2 commits into from
Dec 5, 2023
Merged

Use three-way diffs for merge conflicts #45

merged 2 commits into from
Dec 5, 2023

Commits on Dec 18, 2022

  1. Use three-way diffs for merge conflicts 

    The 'diff3' conflict style also shows the original lines, and this extra
information can help to decide how to best resolve a conflict.
    @robmoss
    robmoss committed Dec 18, 2022
    Configuration menu
    Copy the full SHA
    aadadf8 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Provide additional context for the --global flag. 

    I wanted to highlight that configuration does not have to be done at the user level.
I've included an additional info section to explain that the --local or --system could be used instead, with differing effects.
    @EamonConway
    EamonConway committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    43c711f View commit details
    Browse the repository at this point in the history