Skip to content

Instantly share code, notes, and snippets.

@felipebizz

felipebizz/meld.bash

Last active Sep 24, 2015
Embed
What would you like to do?
Configuration Meld on Git
#install the Meld in your terminal
apt-get install meld
#Do Download of file git_mergetool_opt.sh
https://gist.github.com/felipebizz/a7a54b4f6a3e091925f5
#Let this file in ~/
#open your file gitconfig and add this piece of code
[mergetool "git_mergetool_opt"]
cmd = /home/felipe/git_mergetool_opt.sh "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
[alias] df = diff HEAD
[alias] dft = difftool HEAD
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment