[svk-commit] r2481 - branches/2.0-releng

[nobody at bestpractical.com]

Author: clkao
Date: Tue Jul 17 11:07:50 2007
New Revision: 2481

Modified:
   branches/2.0-releng/MANIFEST

Log:
merge from trunk:
 r2375 at trunk:  clkao | 2007-04-08 08:15:15 +0100
 Update manifest


Modified: branches/2.0-releng/MANIFEST
==============================================================================
--- branches/2.0-releng/MANIFEST	(original)
+++ branches/2.0-releng/MANIFEST	Tue Jul 17 11:07:50 2007
@@ -200,6 +200,7 @@
 t/07smerge-copy-co.t
 t/07smerge-copy.t
 t/07smerge-copy2.t
+t/07smerge-cpdelete.t
 t/07smerge-delete.t
 t/07smerge-dir-replaced.t
 t/07smerge-external.t
@@ -214,6 +215,7 @@
 t/07smerge-relayed.t
 t/07smerge-rename.t
 t/07smerge-rename2.t
+t/07smerge-rename3.t
 t/07smerge-rename-dest.t
 t/07smerge-tags.t
 t/07smerge-to-from.t