zsh: one line prompt
Merge remote-tracking branch 'origin/master' into ccap