Skip to content

Instantly share code, notes, and snippets.

@gurdotan

gurdotan/gist:3596190

Created September 2, 2012 09:27
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save gurdotan/3596190 to your computer and use it in GitHub Desktop.
Save gurdotan/3596190 to your computer and use it in GitHub Desktop.
Download ZIP
Git 3-way merge with meld
Raw
gistfile1.sh
### Add the following to HOME/tools/bin/gitmerge
#!/bin/sh
meld $2 $1 &
sleep 0.5
meld $1 $3 &
sleep 0.5
meld $2 $4 $3
### Make it executable
chmod +x ~/tools/bin/gitmerge
### Add the following to ~/.gitcofig
[merge]
tool = mymeld
[mergetool "mymeld"]
cmd = $HOME/bin/gitmerge $BASE $LOCAL $REMOTE $MERGED
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment