added winmerge as merge tool sample file
added winmerge as merge tool sample file

added a sample that contains the configuration needed into the .gitconfig file to use winmerge as merge and diff tool.
andrestroy/GithubNotes