[Lunar-commits] <lunar> lvu: small cosmetic fix for conflicts

Stefan Wold ratler at lunar-linux.org
Sat Nov 27 11:07:39 CET 2010


commit 16433bfd8c839d6b5f35967e04f65ee71bf3876f
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Nov 27 11:07:39 2010 +0100

    lvu: small cosmetic fix for conflicts
---
 bin/lvu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/bin/lvu b/bin/lvu
index 7c5c97e..ee70f67 100755
--- a/bin/lvu
+++ b/bin/lvu
@@ -462,7 +462,7 @@ show_conflicts()  {
   done
 
   for i in ${!conflicts2[@]}; do
-    echo -e "${MESSAGE_COLOR}Conflicting files for modules ${MODULE_COLOR}${i/,/, }${DEFAULT_COLOR}:"
+    echo -e "${MESSAGE_COLOR}Conflicting file(s) for modules ${MODULE_COLOR}${i//,/, }${DEFAULT_COLOR}:"
     for i in ${conflicts2[$i]}; do
       echo -e " ${FILE_COLOR}$i${DEFAULT_COLOR}"
     done


More information about the Lunar-commits mailing list