diff tests/test-rename-dir-merge @ 3748:7b88bd88f040

Fix test-rename-dir-merge for different implementations of ls.

--- a/tests/test-rename-dir-merge	Fri Dec 01 14:46:05 2006 +0100
+++ b/tests/test-rename-dir-merge	Fri Dec 01 15:40:23 2006 +0100
@@ -21,12 +21,12 @@
 hg ci -m "2 add a/c" -d "0 0"
 
 hg merge --debug 1
-ls a/ b/
+echo a/* b/*
 hg st -C
 hg ci -m "3 merge 2+1" -d "0 0"
 
 hg co -C 1
 hg merge --debug 2
-ls a/ b/
+echo a/* b/*
 hg st -C
 hg ci -m "4 merge 1+2" -d "0 0"