Bash: crlf can check single file.
Git: conflicts alias.
Merge branch 'master' of github.com:sapegin/dotfiles
.ackrc.