X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fmerge1.sh;h=b64830303e938ada71ffe981d09ba44d6e2a4205;hb=0075908db7a7a1513db2f1461037e79b5f49c189;hp=1fcebec1ae84412699df484431382765c1da768f;hpb=cbb454150790aceec1153749302cb6e8f4449f1d;p=fs%2Flustre-release.git

diff --git a/build/merge1.sh b/build/merge1.sh
index 1fcebec..b648303 100755
--- 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