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

Set ff = false

Browse source
This commit is contained in:
Maximilian Friedersdorff 2025-10-03 10:18:38 +01:00
parent 09a221d787
commit a7a2b00707
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/dot_config/git/config
View file

@ -41,7 +41,7 @@
path = /home/max/.config/git/config-esl path = /home/max/.config/git/config-esl
[merge] [merge]
conflictStyle = zdiff3 conflictStyle = zdiff3
ff = true ff = false
tool = vimdiff tool = vimdiff
[mergetool "vimdiff"] [mergetool "vimdiff"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'