commit 3dfc7d33e6e9bdc1857308d42ef48e3cd7201be3
author Marko Man <darkobas@gmail.com> Mon Jun 03 22:33:47 2019 +0200
committer Marko Man <darkobas@gmail.com> Mon Jun 03 22:33:47 2019 +0200
tree 57068e0dc02820506620155360c91a5e8cb1d89e
parent 5ae557c452be45766dd4939d306a62dc639651c7

vendor: fix colors in merge script

somehow wrong ps was pushed

Change-Id: Ie63e9e7fa946e93772c298503c9fe241fd108bb0

utils/aosp-merge.sh

diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index da5ec2b..69da619 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -45,9 +45,9 @@
     ret=$(git pull https://android.googlesource.com/platform/$aosp_project ${ref} 2>&1);
 
     if echo $ret | grep "CONFLICT (content)" > /dev/null ; then
-        echo " -> \e[33mWARNING!: \e[31mMERGE CONFLICT";
+        echo -e " -> \e[33mWARNING!: \e[31mMERGE CONFLICT\e[0m";
     else
-        echo " -> \e[32mDONE!";
+        echo -e " -> \e[32mDONE!\e[0m";
     fi
 
     cd - > /dev/null;