posh git setup codez

corestarter

[core]
	autocrlf = true
	editor = notepad.exe

diffmerge-diff.sh

#!/bin/sh

path="$1"
old="$2"
new="$5"

"C:/Program Files (x86)/SourceGear/DiffMerge/DiffMerge.exe" "$old" "$new" --title1="Old" --title2="New $path"

diffmerge-merge.sh

#!/bin/sh

localPath="$2"
basePath="$1"
remotePath="$3"
resultPath="$4"

if [ ! -f $basePath ]
then
    basePath="c:/Users/Joseph/diffmerge-empty"
fi

"C:/Program Files (x86)/SourceGear/DiffMerge/DiffMerge.exe" --merge --result="$resultPath" "$localPath" "$basePath" "$remotePath" --title1="Mine" --title2="Merged: $4" --title3="Theirs"

gitconfigEdit

[merge]
	tool = diffmerge
[mergetool "diffmerge"]
	cmd = "c:/Users/<username>/GitConfigFiles/diffmerge-merge.sh" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	trustExitCode = false
	keepBackup = false
[diff]
	tool = diffmerge
	external = c:/Users/<username>/GitConfigFiles/diffmerge-diff.sh