Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-rename-dir-merge.t
changeset 18360 760c0d67ce5e
parent 18135 a6fe1b9cc68f
child 18605 bcf29565d89f 
--- a/tests/test-rename-dir-merge.t	Wed Dec 12 02:38:14 2012 +0100
+++ b/tests/test-rename-dir-merge.t	Tue Jan 15 02:59:12 2013 +0100
@@ -39,9 +39,9 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740
-   a/c: remote renamed directory to b/c -> d
+   a/a: other deleted -> r
    a/b: other deleted -> r
-   a/a: other deleted -> r
+   a/c: remote renamed directory to b/c -> d
    b/a: remote created -> g
    b/b: remote created -> g
   updating: a/a 1/5 files (20.00%)
mercurial