Mike,
I forgot one of your point.
I might have missed the reason why, but it seems like there is a perforce
tool coded into the sample gitconfig. Reason?
That's only an example of how you can configure a external merge tool on a
windows machine, I use P4Merge because it suits me, any other might apply, I
just shown how it stands in the .gitconfig.
If someone want to you WinMerge, just replace:
[merge]
tool = p4merge
[mergetool "p4merge"]
path = C:\\Program Files\\Perforce\\p4merge.exe
by
[merge]
tool = winmerge
[mergetool "winmerge"]
path = <PATH_TO WINMERGE>\\winmerge.exe
Thanks,
-Fred
