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

git merge tool: meld

Browse source
This commit is contained in:
Yax 2022-02-07 15:24:46 +01:00
parent 3bedf87cf1
commit 0cb0f6e798
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dot_gitconfig.tmpl
View file

@ -34,3 +34,9 @@
helper = store helper = store
[credential "https://github.com"] [credential "https://github.com"]
helper = cache helper = cache
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
[merge]
tool = meld