Skip to content

Instantly share code, notes, and snippets.

@lrytz
Last active Sep 28, 2015
Embed
What would you like to do?
3+2x2-way git mergetool
[mergetool "meld"]
cmd = meld $LOCAL $BASE $REMOTE -o $MERGED --diff $BASE $LOCAL --diff $BASE $REMOTE
[mergetool "diffmerge"]
cmd = ~/Applications/bin/diffmergemergetool `pwd` \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
[mergetool "ksdiff"]
cmd = ~/Applications/bin/ksdiffmergetool `pwd` \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
#!/bin/sh
DM=/Applications/DiffMerge.app/Contents/MacOS/DiffMerge
PWD=$1
BASE=$PWD/$2
LOCAL=$PWD/$3
REMOTE=$PWD/$4
MERGED=$PWD/$5
$DM $BASE $LOCAL &
$DM $BASE $REMOTE &
$DM --merge --result=$MERGED $LOCAL $BASE $REMOTE
#!/bin/sh
KSD=/Applications/Kaleidoscope.app/Contents/Resources/bin/ksdiff
PWD=$1
BASE=$PWD/$2
LOCAL=$PWD/$3
REMOTE=$PWD/$4
MERGED=$PWD/$5
$KSD $BASE $LOCAL
$KSD $BASE $REMOTE
$KSD --merge --wait --output $MERGED --base $BASE -- $LOCAL --snapshot $REMOTE --snapshot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment