X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fmerge2.sh;h=0ef27cc45ac04dbd68395c7bb6df3b057e252f76;hb=3ec611d61138de3901944e4fdb50d8872fd472d5;hp=92cb375266fe39a87d7b3a9cd243b8a225c5cea8;hpb=f7a2d07e30db3462880feb00a0461ee056b225c6;p=fs%2Flustre-release.git diff --git a/build/merge2.sh b/build/merge2.sh index 92cb375..0ef27cc 100755 --- a/build/merge2.sh +++ b/build/merge2.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e if [ ! -f .mergeinfo ] ; then echo ".mergeinfo doesn't exist - exit"