--- a/.bash_prompt	Sun Dec 21 17:16:28 2014 +0800
+++ b/.bash_prompt	Sun Dec 21 17:55:50 2014 +0800
@@ -129,6 +129,9 @@
     if [[ $STATUS == *'Changes not staged'* ]] ; then
         local UNSTAGED="$P?"
     fi
+    if [[ $STATUS == *'You have unmerged paths.'* ]] ; then
+        local MERGE="$R+$MERGEREV"
+    fi
     if [[ $STATUS == *'All conflicts fixed but you are still merging.'* ]] ; then
         local MERGE="$B+$MERGEREV"
     fi