Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Git Extensions and Meld merge

Is it possible to use Meld as a merge tool when using Git Extensions on Windows?

like image 624
Drew Noakes Avatar asked Jul 19 '13 09:07

Drew Noakes


2 Answers

In Git Extension: Settings -> Git Config

Merge tool: meld
Path to mergetool: C:/Program Files (x86)/Meld/Meld.exe
Merge tool command: "C:/Program Files (x86)/Meld/Meld.exe" --diff "$BASE" "$LOCAL" "$REMOTE" --output "$MERGED"
like image 79
Tomasz Maj Avatar answered Sep 18 '22 15:09

Tomasz Maj


Yes it is, in response to this issue.

like image 24
Drew Noakes Avatar answered Sep 22 '22 15:09

Drew Noakes