Permalink
Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
12 lines (12 sloc) 301 Bytes
[user]
name = Gabriel Mancini
email = gabriel.mancini@gmail.com
[core]
editor = vim
[diff]
external = /home/gabriel/dotfiles/git_meld_diff.sh
[merge]
tool = mymeld
conflictstyle = diff3
[mergetool "mymeld"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED