Skip to content

Instantly share code, notes, and snippets.

@renaco
Last active September 27, 2022 08:29
Show Gist options
  • Select an option

  • Save renaco/89cdffdbc365530a14a4619ce17791ad to your computer and use it in GitHub Desktop.

Select an option

Save renaco/89cdffdbc365530a14a4619ce17791ad to your computer and use it in GitHub Desktop.
.gitconfig (Meld configuration on windows)
[merge]
tool = meld
[mergetool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$BASE" "$REMOTE" "--output=$MERGED"
path = C:/Program Files (x86)/Meld/Meld.exe
trustExitCode = false
keepBackup = false
[diff]
tool = meld
[difftool "meld"]
cmd = \"C:\\Program Files (x86)\\Meld\\Meld.exe\" "$LOCAL" "$REMOTE"
path = C:/Program Files (x86)/Meld/Meld.exe
[mergetool]
keepBackup = false
@Franky1

Franky1 commented Jun 29, 2017

Copy link
Copy Markdown

Thanks for this Gist.
This is the only solution for windows that worked for me without modifying PATH variable.
All the other BS on Stack Overflow is completely misleading...

@ihorallin

Copy link
Copy Markdown

Thx bro

@RecoX

RecoX commented Aug 24, 2018

Copy link
Copy Markdown

thanks working

@nimabte

nimabte commented Apr 1, 2020

Copy link
Copy Markdown

Thanks man :)

@maspi83

maspi83 commented Dec 27, 2020

Copy link
Copy Markdown

Thx for sharing

@capitalwell

Copy link
Copy Markdown

Thanks

@tiamatenko

Copy link
Copy Markdown

Probably it won't work on Windows 10 with Meld-3.22.0-mingw since it has another install path:

where Meld
C:\Program Files\Meld\Meld.exe

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment