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

tests/test-rename-dir-merge

@@ -21,12 +21,12 b' hg add a/c'
 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"

tests/test-rename-dir-merge.out

@@ -21,11 +21,7 b' getting b/a'
 getting b/b
 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-ls: a/: No such file or directory
-b/:
-a
-b
-c
+a/* b/a b/b b/c
 M b/a
 M b/b
 A b/c
@@ -41,10 +37,6 b' resolving manifests'
 getting a/c to b/c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-ls: a/: No such file or directory
-b/:
-a
-b
-c
+a/* b/a b/b b/c
 A b/c
   a/c