heavy/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Wiki Activity

Added 'meld' as mergetool on Linux.

Browse Source
This commit is contained in:
Heavy 2021-06-09 10:54:18 +02:00
parent fcda37b123
commit e28fb54e03
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dot_gitconfig.tmpl
View File

@ -83,6 +83,15 @@
cmd = "'c:/PortableApps/PortableApps/WinMergePortable/App/WinMerge/WinMergeU'" -e "$LOCAL" "$REMOTE" cmd = "'c:/PortableApps/PortableApps/WinMergePortable/App/WinMerge/WinMergeU'" -e "$LOCAL" "$REMOTE"
{{ end -}} {{ end -}}
{{ if eq .chezmoi.os "linux" -}}
# see https://stackoverflow.com/questions/34119866/setting-up-and-using-meld-as-your-git-difftool-and-mergetool
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
{{ end -}}
[http] [http]
# proxy = http://host:port # proxy = http://host:port