MeldMerge, Tortoise git
Looking for the commands to setup meldmerge for diff and 3-way merge, here is my current setup. Path/DiffCommand: C:\Program Files (x86)\Meld\Meld.exe Diff Arguments: "$LOCAL" "$BASE" Merge Arguments: "$LOCAL" "$BASE" "$REMOTE" --auto-merge --output="$MERGED"