[svk-commit] r2969 - trunk/t

[nobody at bestpractical.com]

Author: ruz
Date: Fri Jul  4 08:18:55 2008
New Revision: 2969

Modified:
   trunk/t/29update-props.t

Log:
* this test has been fixed

Modified: trunk/t/29update-props.t
==============================================================================
--- trunk/t/29update-props.t	(original)
+++ trunk/t/29update-props.t	Fri Jul  4 08:18:55 2008
@@ -78,12 +78,9 @@
         " C  t/checkout/smerge/me",
         "1 conflict found.",
     ] );
-    TODO: {
-    local $TODO = "prop conflict should be stated as prop conflict";
     is_output($svk, 'st', [$copath], [
         " C  t/checkout/smerge/me",
     ] );
-    }
 
     # XXX: this looks wierd a littl without line endings
     is_output($svk, 'di', [$copath], [