Meld Git difftool / mergetool
Git users often use Meld to graphically resolve 2-way differences and 3-way merges.
Configure Git to use Meld:
git config --global diff.tool meld
git config --global merge.tool meld
Windows
Windows users additionally do:
git config --global mergetool.meld.path "C:\\Program Files\\meld\\Meld.exe"
Do not use %PROGRAMFILES(X86)%
as this doesn’t work from PowerShell.
Alternatives:
- Visual Studio Code: Git difftool and mergetool
- Matlab can compare and merge segments of files with visdiff()