[Minor] [minor commit] r635 - branches/branch1

[jimb at red-bean.com]

Author: jimb
Date: Tue Jul 11 18:35:18 2006
New Revision: 635

Modified:
   branches/branch1/TODO

Log:
See how SVK merging reacts to the same change coming from two
different sources.


Modified: branches/branch1/TODO
==============================================================================
--- branches/branch1/TODO	(original)
+++ branches/branch1/TODO	Tue Jul 11 18:35:18 2006
@@ -36,6 +36,8 @@
 
 --- others
 
+A change made twice.
+
 * Use ISO C 'inline', instead of GCC hair.
 
 * numeric conversion functions for size_t, intmax_t, and uintmax_t.