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-stabilize-conflict.t
branchmercurial-4.2
changeset 3001 67b59d1657cf
parent 2798 2280461343e5
parent 3000 bd7e8be29542
child 3003 ddf28837f5af
child 3108 9c9c8c1eeb93
equal deleted inserted replaced
2808:f47ed78ab17b 3001:67b59d1657cf 
   159      date:        Thu Jan 01 00:00:00 1970 +0000
 
   159      date:        Thu Jan 01 00:00:00 1970 +0000
 
   160      summary:     babar count up to five
 
   160      summary:     babar count up to five
 
   161   
   161   
   162 (fix the conflict and continue)
 
   162 (fix the conflict and continue)
 
   163 
   163 
   164   $ hg revert -r 5 --all
 
   164   $ hg revert -r 71c18f70c34f --all
 
   165   reverting babar
 
   165   reverting babar
 
   166   $ safesed 's/dix/ten/' babar
 
   166   $ safesed 's/dix/ten/' babar
 
   167   $ hg resolve --all -m
 
   167   $ hg resolve --all -m
 
   168   (no more unresolved files)
 
   168   (no more unresolved files)
 
   169   $ hg evolve --continue
 
   169   $ hg evolve --continue
evolve