si9ma
1/13/2019 - 6:28 AM

git config - diff and merge tool(meld)

git config - diff and merge tool(meld)

git config.txt
content_copyfile_download
[diff]
    tool = meld
[difftool]
    prompt = false
[difftool "meld"]
    cmd = meld "$LOCAL" "$REMOTE"
[merge]
    tool = meld
[mergetool "meld"]
    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"