robbyrussell/oh-my-zsh — pull request #2682 by mafrosis (2014-04-04 01:55:54+00:00)
Title: Enable display of dirty unmerged status in git prompt

Introduces a new env var `$ZSH_THEME_GIT_PROMPT_DIRTY_UNMERGED` to enable a different display of an **unmerged** dirty tree in your prompt.

I imagine `grep -E '^(AA|UU) '` can be improved upon..