max/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

Improve vim conflict resolution

Browse source
This commit is contained in:
Maximilian Friedersdorff 2025-09-09 14:11:07 +01:00
parent 79e82f8c6a
commit a78805ebcc
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/dot_config/git/config
View file

@ -8,6 +8,7 @@
syntax-theme = Solarized (dark)
[diff]
colorMoved = default
tool = vimdiff
[interactive]
diffFilter = delta --color-only
[color]
@ -41,6 +42,9 @@
[merge]
conflictStyle = zdiff3
ff = true
tool = vimdiff
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[push]
default = simple
[alias]