Mercurial Mercurial > pub > hg > evolve / comparison
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-topic-stack-complex.t
branchmercurial-5.1
changeset 5086 553b2f2fda93
parent 4998 88b816a9d990
child 5079 1f92a6aa40d6
child 5087 5d76b320420e
equal deleted inserted replaced
4967:844c9eb2400f 5086:553b2f2fda93 
   174   $ hg evolve --content-divergent -r ec94a1ed1330
 
   174   $ hg evolve --content-divergent -r ec94a1ed1330
 
   175   merge:[s5] Added e and f
 
   175   merge:[s5] Added e and f
 
   176   with: [s4] Added e and f
 
   176   with: [s4] Added e and f
 
   177   base: [3] Added e and f
 
   177   base: [3] Added e and f
 
   178   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   178   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   179   working directory is now at 8faad6276dc6
 
   179   working directory is now at 80b2ddbf01d3
 
       
   180 
       
   181   $ hg log -r 80b2ddbf01d3 -T '{date|hgdate}\n'
 
       
   182   0 1
evolve