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

feat: use nvim as default mergetool

Browse source
This commit is contained in:
Michael Mandl 2021-07-19 11:33:12 +02:00
parent bd513894df
commit 8e3eebdcff
Signed by: mandlm
GPG key ID: 4AA25D647AA54CC7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git/gitconfig
View file

@ -61,7 +61,7 @@
[format] [format]
pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
[merge] [merge]
tool = bc tool = nvim
[mergetool "nvim"] [mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\" cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool "bc"] [mergetool "bc"]