diginaut/dotfiles
1
0
Fork 0
mirror of https://github.com/aquatix/dotfiles.git synced 2025-12-06 20:35:11 +01:00
Code Issues 1 Releases Wiki Activity

20250425: use vimdiff with merge conflicts; default git branch is 'main'

Browse Source
This commit is contained in:
Michiel Scholten
2025-05-13 13:39:24 +02:00
parent 0f04e1831a
commit 5ad43aa897
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitconfig
View File

@@ -78,3 +78,7 @@
# postBuffer = 1048576000 # postBuffer = 1048576000
# lowSpeedLimit = 0 # lowSpeedLimit = 0
# lowSpeedTime = 999999 # lowSpeedTime = 999999
[init]
defaultBranch = main
[merge]
tool = vimdiff