How to set Meld as git mergetool

by

You could use complete unix paths like:

PATH=$PATH:/c/python26
git config --global merge.tool meld
git config --global mergetool.meld.path /c/Program files (x86)/meld/bin/meld

This is what is described in “How to get meld working with git on Windows“

Or you can adopt the wrapper approach described in “Use Meld with Git on Windows“

# set up Meld as the default gui diff tool
$ git config --global  diff.guitool meld

# set the path to Meld
$ git config --global mergetool.meld.path C:/meld-1.6.0/Bin/meld.sh

With a script meld.sh:

#!/bin/env bash
C:/Python27/pythonw.exe C:/meld-1.6.0/bin/meld $@

abergmeier mentions in the comments:

I had to do: 

git config --global merge.tool meld
git config --global mergetool.meld.path /c/Program files (x86)/Meld/meld/meldc.exe

Note that meldc.exe was especially created to be invoked on Windows via console. Thus meld.exe will not work properly.

CenterOrbit mentions in the comments for Mac OS to install homebrew, and then: 

brew cask install meld
git config --global merge.tool meld
git config --global  diff.guitool meld

More Related Contents:

  1. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  2. I ran into a merge conflict. How can I abort the merge?
  3. What is the best (and safest) way to merge a Git branch into master?
  4. Is there a “theirs” version of “git merge -s ours”?
  5. How can I merge multiple commits onto another branch as a single squashed commit?
  6. Merge, update, and pull Git branches without using checkouts
  7. Re-doing a reverted merge in Git
  8. Is there a git-merge –dry-run option?
  9. When would you use the different git merge strategies?
  10. What’s the difference between ‘git merge’ and ‘git rebase’?
  11. How do I safely merge a Git branch into master?
  12. I ran into a merge conflict. How do I abort the merge?
  13. What’s the simplest way to list conflicted files in Git?
  14. Git merge hotfix branch into feature branch
  15. How to force consistent line endings in Git commits with cross-platform compatibility
  16. Get changes from master into branch in Git
  17. Git merge error “commit is not possible because you have unmerged files”
  18. Find unmerged Git branches?
  19. how can I customize git’s merge commit message?
  20. Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch
  21. error: Your local changes to the following files would be overwritten by checkout
  22. How to do a fast-forward merge on GitHub?
  23. Tell git not to merge binary files but to choose
  24. How to keep a branch synchronized/updated with master?
  25. How to merge specific files from Git branches
  26. How to see commits that were merged in to a merge commit?
  27. Merge, update, and pull Git branches without using checkouts
  28. Git: Merge a Commit into a different Branch
  29. Telling if a Git commit is a Merge/Revert commit
  30. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

Leave a Comment