Run these with "bash" not "sh" since they use bash-only features disabled
when newer versions of bash are invoked as "sh".
-#!/bin/sh -e
+#!/bin/bash -e
CVS=${CVS:-cvs}
progname=${0##*/}
-#!/bin/sh -e
+#!/bin/bash -e
progname=${0##*/}
-#!/bin/sh -e
+#!/bin/bash -e
CVS=cvs
-#!/bin/sh -e
+#!/bin/bash -e
CONFLICTS=cvs-merge-conflicts
CVS="cvs -z3"
-#!/bin/sh -e
+#!/bin/bash -e
if [ ! -f .mergeinfo ] ; then
echo ".mergeinfo doesn't exist - exit"
-#!/bin/sh -e
+#!/bin/bash -e
progname=${0##*/}
-#!/bin/sh -e
+#!/bin/bash -e
CVS=cvs
git://git.whamcloud.com / fs / lustre-release.git / commitdiff