Git Config for Windows using Meld as diff/merge tool

.gitconfig

[core]
	autocrlf = false
	editor = code --wait
[diff]
	tool = meld
[difftool]
	prompt = false
	cmd = meld "$LOCAL" "$REMOTE"
[merge]
	tool = meld
	conflictstyle = diff3
[mergetool]
	prompt = false
	cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
    	#cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
	keepBackup = true

meld

#! /bin/bash

/c/Program\ Files\ \(x86\)/Meld/Meld.exe $@

I am using Visual Studio Code and git bash as the integrated terminal. Created the meld bash script and put it in bin folder created in my home directory. Added bin folder to my path environment variable so that I could run 'meld' from git bash command line.

In Windows updated path variable in the UI:

• Right click on This PC from Start Menu > Properties
• Clicked Advanced System Settings > Environment Variables
• Double click Path > clicked New
• Entered %USERPROFILE%/bin

Inspired by the following resources:
https://blog.building-blocks.com/using-meld-as-a-git-merge-tool-on-windows/
https://stackoverflow.com/questions/34119866/setting-up-and-using-meld-as-your-git-difftool-and-mergetool