[dflock]

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

[panick21_]

So this works by 'git merge feature/branch' and then call 'git mt'?

[dflock]

Yes. If you have a conflict, you can either run `git mergetool` and it will use that meld config. `git mt` is an alias for `git mergetool`.