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

Git: remove unneeded configuration for meld diff/mergetools

Browse source
This commit is contained in:
Marko Korhonen 2023-05-23 22:20:27 +03:00
parent 4e59e69155
commit e2eb38516b
Signed by: FunctionalHacker
GPG key ID: A7F78BCB859CD890
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
home/.config/git/config
View file

@ -30,21 +30,12 @@
[mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[mergetool "meld"]
cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
[diff]
tool = meld
[difftool]
prompt = false
[difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE
[difftool "meld"]
cmd = meld --diff $LOCAL $REMOTE
[pull]
rebase = merges