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

git: Use nvimdiff1 as the merge tool

Browse source 
The feature provided by the vim-diffconflicts plugin seems to have been
merged upstream. Use of nvimdiff1 should now suffice.

See https://www.eseth.org/2020/mergetools.html

There also seems to be a new proposal adding layout support which will
be interesting once merged.
https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/
This commit is contained in:
Sanchayan Maity 2022-05-03 09:42:48 +05:30
parent 16c4e4ee27
commit 96aa7aec83
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
git/.gitconfig
View file

@ -26,15 +26,12 @@
[difftool "kitty"] [difftool "kitty"]
cmd = kitty +kitten diff $LOCAL $REMOTE cmd = kitty +kitten diff $LOCAL $REMOTE
[merge] [merge]
tool = diffconflicts tool = nvimdiff1
conflictstyle = zdiff3 conflictstyle = zdiff3
ff = only ff = only
[mergetool] [mergetool]
prompt = false prompt = false
keepBackup = false keepBackup = false
[mergetool "diffconflicts"]
cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
trustExitCode = true
[rebase] [rebase]
autosquash = true autosquash = true
autoStash = true autoStash = true