From 3d1ec8975edb90ff71e53484726e7a21764eebab Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Mon, 30 May 2005 20:25:33 +0000
Subject: [PATCH] HEAD Fix error messages.

---
 build/land1.sh  | 2 +-
 build/merge1.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/land1.sh b/build/land1.sh
index ce152f7..6765c37 100755
--- a/build/land1.sh
+++ b/build/land1.sh
@@ -30,7 +30,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 land lustre or portals, not the whole tree."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi
diff --git a/build/merge1.sh b/build/merge1.sh
index d874054..b648303 100755
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -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
-- 
1.8.3.1