Set mergestyle.
Merge branch 'master' of ssh://github.com/mattikus/dotfiles
Fixed split better for zsh.