X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fmerge1.sh;h=cbd32279c7a97d4434a525fbaa461ad266437c9a;hb=fbf357543635d2fb9fa06f20e575e2d908d9d3c8;hp=b64830303e938ada71ffe981d09ba44d6e2a4205;hpb=3d1ec8975edb90ff71e53484726e7a21764eebab;p=fs%2Flustre-release.git

diff --git a/build/merge1.sh b/build/merge1.sh
index b648303..cbd3227 100755
--- a/build/merge1.sh
+++ b/build/merge1.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 CONFLICTS=cvs-merge-conflicts
 CVS="cvs -z3"
@@ -51,6 +51,7 @@ if [ "$child" != "HEAD" -a "`cat $dir/CVS/Tag 2> /dev/null`" != "T$child" ]; the
 fi
 
 TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
+[ $dir = "build" ] && TEST_FILE=lbuild
 check_tag() {
 	[ -z "$1" ] && echo "check_tag() missing arg" && exit3
 	[ "$1" = "HEAD" ] && return