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

`.gitconfig` diff tool #7

Open

arran4 opened this issue Sep 9, 2021 · 1 comment

Assignees

Owner

arran4 commented Sep 9, 2021

Search for kdiff3 on windows linux try a couple depending on env (maybe bin/diff it?)

[diff]
  tool = vimdiff3

The text was updated successfully, but these errors were encountered:

arran4 self-assigned this

Owner Author

arran4 commented Sep 9, 2021

[merge]
  tool = vimdiff3
  conflictstyle = diff3
  prompt = false

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