Fix git difftool
This commit is contained in:
parent
fa8e0e7331
commit
bce2d6d6b1
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue