Author: jacopoc
Date: Fri May 11 07:55:07 2012
New Revision: 1337047
URL:
http://svn.apache.org/viewvc?rev=1337047&view=revLog:
Fixed message to reflect new name of the ant task to load demo data.
Modified:
ofbiz/trunk/tools/mergefromtrunk.sh
Modified: ofbiz/trunk/tools/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/tools/mergefromtrunk.sh?rev=1337047&r1=1337046&r2=1337047&view=diff==============================================================================
--- ofbiz/trunk/tools/mergefromtrunk.sh (original)
+++ ofbiz/trunk/tools/mergefromtrunk.sh Fri May 11 07:55:07 2012
@@ -26,7 +26,7 @@ help() {
$0 [options]
mergefromtrunk.sh merge \$rev Apply revision \$rev from trunk.
-mergefromtrunk.sh test Run test suite(clean-all, run-install, run-tests).
+mergefromtrunk.sh test Run test suite(clean-all, load-demo, run-tests).
mergefromtrunk.sh commit Commit current fix to svn.
mergefromtrunk.sh abort Abort current merge session.