matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-25 21:19:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use vimdiff.

Browse Source
This commit is contained in:
David Tomaschik
2019-09-22 19:22:34 -07:00
parent 40fa505146
commit b45f977de9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dotfiles/gitconfig
View File

@@ -58,3 +58,8 @@
helper = cache --timeout=36000 helper = cache --timeout=36000
[receive] [receive]
denyCurrentBranch = updateInstead denyCurrentBranch = updateInstead
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false