Change gitconfig autocrlf and add conflicts
Change gitconfig autocrlf and add conflicts

* autocrlf=input seems to work better than =true
* alias conflicts - listing conflicts when working on branches

Bruners/linux-configs,Bruners/linux-configs