tweaked gitconfig to use kdiff3 for a merge tool & ignore line endings

Created by  Calcifer  on March 12, 2016
CBL5HZKPBD63W2IZ76TTD2W2GXMOEKAIQFLCWNB2EUO6V3PX2IOAC
In channels
main
Change contents