Git Extensions and Meld merge

问题:

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

回答1:

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"

回答2:

Yes it is, in response to this issue.

回答3:

Like Thomas, the accepted answer didn't quite work for me. The merged file was not saved after meld was closed. However, Thomas's answer didn't work for me either. While the file did save, it opened in Meld with the merged markup.

Instead, I'm using a command line I've been using with Sourcetree. Here's what worked for me.

Mergetool command = </path/to/Meld.exe> \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\" --auto-merge

回答4:

This answer is correct. The other answer won't save the merge result/ changes to your actual workspace file!

In Git Extension: Settings -> Git Config

Mergetool = meld    (just type it in, don't use the combo)
Path to mergetool = </path/to/Meld.exe>
Mergetool command = </path/to/Meld.exe> \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output \"$MERGED\"

I had been struggling to get Meld working with GitExtensions, trying the previous answer & related posts.

This is a revised answer -- I had previously posted the command-line 'git mergetool' uses, but that didn't offer a clean 3-way merge with ancestor; instead the center pane showed conflict markers.

See also my GitHub comment on the GitExtensions feature-request discussing this.