hack to always use root credential between client and oss.

[fs/lustre-release.git] / build / merge1.sh

diff --git a/build/merge1.sh b/build/merge1.sh
index 1fcebec..b648303 100755 (executable)
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -14,7 +14,7 @@ if [ -f $CONFLICTS ] ; then
 fi
 
 if [ $# -lt 2 -o $# -gt 3 ]; then
-    echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
+    echo "This is phase 1 of merging branches. Usage: $0 parent child dir"
     exit
 fi
 
@@ -28,7 +28,7 @@ dir=${3:-.}
 module=$(basename $(<$dir/CVS/Repository))
 
 if [ "$module" = "lustre" ] ; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree."
+    echo >&2 "${progname}: You probably want to merge lustre or portals, not the whole tree."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi