Author: ben
Date: 2007-07-25 22:02:43 -0700 (Wed, 25 Jul 2007)
New Revision: 5803
Modified:
sandbox/ben/branches/cuppatea/README.txt
Log:
experimental changes to figure out bidirectional merging with svnmerge
Modified: sandbox/ben/branches/cuppatea/README.txt
===================================================================
--- sandbox/ben/branches/cuppatea/README.txt 2007-07-26 05:01:51 UTC (rev
5802)
+++ sandbox/ben/branches/cuppatea/README.txt 2007-07-26 05:02:43 UTC (rev
5803)
@@ -3,6 +3,9 @@
Here is a lovely edit made by ben in the cuppajoe branch. We would like
to see this change turn up in the cuppatea branch eventually.
+And here is another lovely change by ben, made in the cuppatea branch.
+If all goes well, we'll see it back in the cuppajoe branch -- maybe.
+
Here's what you'll find:
LICENSE.txt - The End User License Agreement for the LPS.
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
