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-graft.t
changeset 23482 208ec8ca7c79
parent 23463 bb0143e12f35
child 23504 e172a1f2b5bb 
--- a/tests/test-graft.t	Thu Dec 04 23:08:27 2014 -0500
+++ b/tests/test-graft.t	Wed Dec 03 14:03:20 2014 -0800
@@ -168,7 +168,7 @@
    e: remote is newer -> g
   getting e
   updating: e 1/1 files (100.00%)
-   b: keep -> k
+   b: remote unchanged -> k
   e
   grafting revision 4
     searching for copies back to rev 1
@@ -179,7 +179,7 @@
    d: remote is newer -> g
   getting d
   updating: d 1/2 files (50.00%)
-   b: keep -> k
+   b: remote unchanged -> k
    e: versions differ -> m
   updating: e 2/2 files (100.00%)
   picked tool 'internal:merge' for e (binary False symlink False)
mercurial