commit 551d48a1abf94a0dc709a0af7ef7b62df7214ce4
author Marko Man <darkobas@gmail.com> Tue May 07 09:55:37 2019 +0200
committer Max Weninger <max.weninger@gmail.com> Thu May 09 14:25:57 2019 +0200
tree 16c495559c70f35e931427035715babace14bf45
parent d28264e16079100058ae9a333201f9151d369074

vendor: utils: add colors to merge script output

Change-Id: I3920c92a0d5615eaf8059bb70441310e0e591fb8

utils/aosp-merge.sh

diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index 418c393..da5ec2b 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 " -> WARNING!: MERGE CONFLICT";
+        echo " -> \e[33mWARNING!: \e[31mMERGE CONFLICT";
     else
-        echo " -> DONE!";
+        echo " -> \e[32mDONE!";
     fi
 
     cd - > /dev/null;