olexsmir/dotfiles
1
Fork 0
mirror of https://github.com/olexsmir/dotfiles.git synced 2026-01-15 08:41:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

git: use vim as merge tool

Browse source
This commit is contained in:
Oleksandr Smirnov 2025-05-21 16:12:32 +03:00
parent 671f34b404
commit ce7b3d1294
No known key found for this signature in database
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gitconfig
View file

@ -34,6 +34,11 @@
[merge] [merge]
conflictstyle = zdiff3 conflictstyle = zdiff3
tool = nvim-diffview
[merge "nvim-diffview"]
cmd = "nvim +DiffviewOpen"
prompt = false
[rebase] [rebase]
autoSquash = true autoSquash = true