b=20615 always send ZC_ACK on non-blocking connection

[fs/lustre-release.git] / build / merge1.sh

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