X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fmerge1.sh;h=cbd32279c7a97d4434a525fbaa461ad266437c9a;hb=6e89d5c2527c48b20e9cd025aea2f81378142e8a;hp=1c9f68f1f2d4308228a309269d370bcd09025260;hpb=5c8edd4c1876f9ad3207cf53ca28ce980b980c4b;p=fs%2Flustre-release.git

diff --git a/build/merge1.sh b/build/merge1.sh
index 1c9f68f..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"