On the plus side the decision to use L7 was already made, so there is no fear or uncertainty about it, regardless of actual performance or need. If nothing else, L7 really makes me appreciate Ubuntu.
Finally got Git working again and I thought I should post my .gitconfig or at least as much as I think I can get away with, without risking my so-called "job."
[user]
name = Dirk
email = my.email@BigOlCompany.com
[core]
editor = c:/Data/_work/Notepad++/notepad++.exe
# whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
autocrlf = true
[apply]
whitespace = nowarn
[color]
ui = auto
[color "branch"]
current = white reverse
local = cyan
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = c:/Program\\ Files/SourceGear/DiffMerge/DiffMerge.exe --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
keepBackup = false
trustExitCode = true