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-4.6
changeset 4212 18d5a7525c2c
parent 4204 2a7f89817540
parent 4210 470ba668687a
child 4214 112980bb2c76
child 4360 522abf1d70b7
equal deleted inserted replaced
4204:2a7f89817540 4212:18d5a7525c2c 
   170   s0^ Added foo (base)
 
   170   s0^ Added foo (base)
 
   171 
   171 
   172   $ hg evolve --content-divergent -r ec94a1ed1330
 
   172   $ hg evolve --content-divergent -r ec94a1ed1330
 
   173   merge:[s5] Added e and f
 
   173   merge:[s5] Added e and f
 
   174   with: [s4] Added e and f
 
   174   with: [s4] Added e and f
 
   175   base: [s] Added e and f
 
   175   base: [3] Added e and f
 
   176   updating to "local" side of the conflict: ec94a1ed1330
 
   176   updating to "local" side of the conflict: ec94a1ed1330
 
   177   merging "other" content-divergent changeset 'f2eff98490d2'
 
   177   merging "other" content-divergent changeset 'f2eff98490d2'
 
   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 8faad6276dc6
evolve