Return to Answer

Usage of Meld

All operating systems: configure meld preferences

When done installing Meld: open Meld --> (on Windows) click the 3 horizontal lines (settings) in the top-right; (on Linux) click "Meld" at the top --> click "Preferences" --> "Editor" tab --> check the boxes for "Enable text wrapping" and "Show line numbers". See the screenshot below:

Usage of Meld

1. 3 dots vs 2 dots: What are the differences between double-dot ".." and triple-dot "..." in Git diff commit ranges?
2. [my answer on my git blametool] Is there git blame gui similar to bzr qannotate?
3. Download and install meld from here: https://meldmerge.org/
4. [my answer] How do I make git use the editor of my choice for editing commit messages?
5. [my repo] https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles
6. Install Meld on Mac OS: https://superuser.com/questions/360007/how-to-install-meld-with-homebrew-on-mac-osx/1177575#1177575

1. My answer on how to compare binary files, hex files, and Intel hex firmware files with meld
2. 3 dots vs 2 dots: What are the differences between double-dot ".." and triple-dot "..." in Git diff commit ranges?
3. [my answer on my git blametool] Is there git blame gui similar to bzr qannotate?
4. Download and install meld from here: https://meldmerge.org/
5. [my answer] How do I make git use the editor of my choice for editing commit messages?
6. [my repo] https://github.com/ElectricRCAircraftGuy/eRCaGuy_dotfiles
7. Install Meld on Mac OS: https://superuser.com/questions/360007/how-to-install-meld-with-homebrew-on-mac-osx/1177575#1177575

Then, to make meld your git difftool, you can use these two commands, inside the Git for Windows bash terminal, (as Arugin says), using the proper path to Meld.exe:

git config --global merge.tool meld
git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"

OR you can just edit your C:\Users\YOUR_USER_NAME\.gitconfig file directly and add the following to the end of it (notice the mandatory usage of the double-backslashes [\\] here as the path separator!):

[merge]
  tool = meld
[mergetool "meld"]
  path = C:\\Program Files (x86)\\Meld\\Meld.exe

Then, to make meld your git difftool, you can use these two commands, inside the Git for Windows bash terminal, (as Arugin says), using the proper path to Meld.exe. Note: for old versions of Windows, your path is likely "C:\Program Files (x86)\Meld\Meld.exe" instead.

git config --global merge.tool meld
git config --global mergetool.meld.path "C:\Program Files\Meld\Meld.exe"

OR you can just edit your C:\Users\YOUR_USER_NAME\.gitconfig file directly and add the following to the end of it (notice the mandatory usage of the double-backslashes [\\] here as the path separator!). Note: again, for old versions of Windows, your path is likely C:\\Program Files (x86)\\Meld\\Meld.exe instead:

[merge]
  tool = meld
[mergetool "meld"]
  path = C:\\Program Files\\Meld\\Meld.exe