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-up-local-change.t
changeset 21389 e741972017d9
parent 20641 3db9e798e004
child 21391 cb15835456cb 
--- a/tests/test-up-local-change.t	Sat May 17 00:47:42 2014 -0700
+++ b/tests/test-up-local-change.t	Fri May 02 01:09:14 2014 +0200
@@ -46,9 +46,9 @@
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
+   b: remote created -> g
    a: versions differ -> m
     preserving a for resolve of a
-   b: remote created -> g
   getting b
   updating: b 1/2 files (50.00%)
   updating: a 2/2 files (100.00%)
@@ -100,9 +100,9 @@
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
+   b: remote created -> g
    a: versions differ -> m
     preserving a for resolve of a
-   b: remote created -> g
   getting b
   updating: b 1/2 files (50.00%)
   updating: a 2/2 files (100.00%)
mercurial