--- a/.bash_prompt	Sat Oct 29 10:58:50 2016 +0800
+++ b/.bash_prompt	Sat Oct 29 10:59:26 2016 +0800
@@ -78,8 +78,8 @@
         local REV=${PARENTS[0]}
         local MERGEREV=${PARENTS[1]}
 
-        [ -z "$MERGEREV" ] || MERGEREV="+$MERGEREV"
         if [[ $BRANCH = 'default' ]] ; then BRANCH='' ; fi
+        if [[ $MERGEREV ]] ; then MERGEREV="+$MERGEREV" ; fi
         case "$COMMIT" in
             *'(clean)'*)
                 COMMIT=''