My .gitconfig for using meld at the git merge tool: [alias] mt = mergetool [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld

My .gitconfig for using meld at the git merge tool: [alias] mt = mergetool [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld"] # Gives you meld, with three comparison tabs. Assuming you're merging others changes into # your branch, this shows you: # - 1st tab: yours|merged result|theirs (do the merge here into the middle pane) # - 2nd tab: base vs your changes (look at just your changes) # - 3rd tab: base vs their changes (look at just their changes) cmd = meld $LOCAL $BASE $REMOTE --output $MERGED --diff $BASE $LOCAL --diff $BASE $REMOTE --auto-merge