Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-dir-merge.out @ 5245:0d28d4e5fe1f
Merge with crew-stable.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 27 Aug 2007 14:55:33 -0300 |
parents | dee573ba79f1 |
children | 17ed9b9a0d03 |
line wrap: on
line diff
--- a/tests/test-rename-dir-merge.out +++ b/tests/test-rename-dir-merge.out @@ -29,6 +29,7 @@ A b/c R a/a R a/b R a/c +b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False @@ -40,3 +41,4 @@ 1 files updated, 0 files merged, 0 files a/* b/a b/b b/c A b/c a/c +b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88