Revisions to Git mergetool with Meld on Windows

Match file case and quote arguments - working in Powershell 5.1 on Win10

Source Link

edit approved Mar 12, 2020 at 6:54

500
5
19

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meldMeld.exe
    cmd = '\"\"/cC/Program Files (x86)/Meld/meldMeld.exe\" $PWD\"$PWD/$LOCAL$LOCAL\" $PWD\"$PWD/$BASE$BASE\" $PWD\"$PWD/$REMOTE$REMOTE\" \"--output=$PWD/$MERGED'$MERGED\"

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld.exe
    cmd = '\"/c/Program Files (x86)/Meld/meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED'

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/Meld.exe
    cmd = \"/C/Program Files (x86)/Meld/Meld.exe\" \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" \"--output=$PWD/$MERGED\"

Removed extrea "/meld" so path now matches what the installer creates (atleast at win10).

Source Link

edit approved Oct 28, 2018 at 6:40

Kurgen

83
1
4

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld/meld.exe
    cmd = '\"/c/Program Files (x86)/Meld/meld/meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED'

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld/meld.exe
    cmd = '\"/c/Program Files (x86)/Meld/meld/meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED'

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld.exe
    cmd = '\"/c/Program Files (x86)/Meld/meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED'

Add missing Quote, and remove quotes around parameters

Source Link

edit approved Aug 12, 2013 at 15:55

Beachhouse

5k
3
27
40

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld/meld.exe
    cmd = ''\"/c/Program Files (x86)/Meld/meld/meld.exe\" \"$PWD$PWD/$LOCAL\"$LOCAL \"$PWD$PWD/$BASE\"$BASE \"$PWD$PWD/$REMOTE\"$REMOTE \"--output=$PWD/$MERGED\"'$MERGED'

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld/meld.exe
    cmd = '/c/Program Files (x86)/Meld/meld/meld.exe\" \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" \"--output=$PWD/$MERGED\"'

Schuess, be careful for space character in directories!

[merge]
    tool = meld
[mergetool "meld"]
    prompt = false
    keepBackup = false
    keepTemporaries = false
    path = C:/Program Files (x86)/Meld/meld/meld.exe
    cmd = '\"/c/Program Files (x86)/Meld/meld/meld.exe\" $PWD/$LOCAL $PWD/$BASE $PWD/$REMOTE --output=$PWD/$MERGED'