search

arran4 / dotfiles

Just a collection of dotfiles managed by Chezmoi
2 stars 2 forks source link

`.gitconfig` diff tool #7

Open arran4 opened 3 years ago

arran4 commented 3 years ago

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

[diff]
  tool = vimdiff3
arran4 commented 3 years ago 
[merge]
  tool = vimdiff3
  conflictstyle = diff3
  prompt = false