# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1186030568 10800
# Node ID e3dffbdc65220f935b416aa302f8af2b0921f27b
# Parent  2bd996d0aaf89c96c47895556be75717ddcb54c0
update tests output

diff --git a/tests/test-issue322.out b/tests/test-issue322.out
--- a/tests/test-issue322.out
+++ b/tests/test-issue322.out
@@ -1,12 +1,12 @@
 % file replaced with directory
 adding a
 % should fail - would corrupt dirstate
-abort: file named 'a' already in dirstate
+abort: file 'a' in dirstate clashes with 'a/a'
 % directory replaced with file
 adding a/a
 % should fail - would corrupt dirstate
-abort: directory named 'a' already in dirstate
+abort: directory 'a' already in dirstate
 % directory replaced with file
 adding b/c/d
 % should fail - would corrupt dirstate
-abort: directory named 'b' already in dirstate
+abort: directory 'b' already in dirstate