4 CURBRANCH
=`currentbranchname`
6 if ( git status|
grep ".dotest/" ); then
7 echo "Need to resolve conflicts updating branch before merge can continue..."
12 if ( git status|
grep ".dotest/" ); then
13 echo "Need to resolve conflicts updating branch before merge can continue..."
17 changebranch
$CURBRANCH