[svk-commit] r2499 - branches/2.0-releng/t

[nobody at bestpractical.com]

Author: clkao
Date: Tue Jul 17 12:06:33 2007
New Revision: 2499

Modified:
   branches/2.0-releng/t/07smerge-rename.t

Log:
merge from trunk:
 r2433 at trunk:  clkao | 2007-07-14 12:07:08 +0100
 Correct a path for win32 tests.


Modified: branches/2.0-releng/t/07smerge-rename.t
==============================================================================
--- branches/2.0-releng/t/07smerge-rename.t	(original)
+++ branches/2.0-releng/t/07smerge-rename.t	Tue Jul 17 12:06:33 2007
@@ -90,6 +90,6 @@
 	    __("D   $lcopath/A/deep/foo"),
 	    __("C   $lcopath/A/deep/test.pl"),
 	    __("D   $lcopath/A/foo"),
-	    __("U   $lcopath/test.pl - A/deep/test.pl"),
+	    __("U   $lcopath/test.pl")." - A/deep/test.pl",
 	    "New merge ticket: $uuid:/trunk:8",
 	    '2 conflicts found.']);