FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Fix git difftool

Browse source
This commit is contained in:
Marko Korhonen 2022-08-23 22:15:18 +03:00
parent 315f2a817f
commit a3fab5a6bb
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/.config/git/config
View file

@ -31,7 +31,7 @@
tool = nvim-diff tool = nvim-diff
[difftool "nvim-diff"] [difftool "nvim-diff"]
cmd = nvim -d -R cmd = nvim -d $LOCAL $REMOTE
[pull] [pull]
rebase = merges rebase = merges