Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-dir-merge.out @ 3748:7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 15:40:23 +0100 |
parents | 205f0fd4a4a1 |
children | 4787e2b0dd03 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.out +++ b/tests/test-rename-dir-merge.out @@ -21,11 +21,7 @@ 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 @@ 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