Git : Updates my windows git config file.

Use p4merge for diffs and merge.