FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 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 747a44d61e
commit aac4c7b266
1 changed files with 0 additions and 9 deletions
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"] [mergetool "nvim"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' 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] [difftool]
prompt = false prompt = false
[difftool "nvim"] [difftool "nvim"]
cmd = nvim -d $LOCAL $REMOTE cmd = nvim -d $LOCAL $REMOTE
[difftool "meld"]
cmd = meld --diff $LOCAL $REMOTE
[pull] [pull]
rebase = merges rebase = merges