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-result.t
branchstable
changeset 4311 8aa28e68ac44
parent 4053 ecbf61d90807
child 4313 4a740f9eee49
child 4454 f530850c8184
child 4481 d02a7c8cdee5
equal deleted inserted replaced
4304:604732387e33 4311:8aa28e68ac44 
    91   @@ -1,1 +1,3 @@
 
    91   @@ -1,1 +1,3 @@
 
    92    a
 
    92    a
 
    93   +a
 
    93   +a
 
    94   +newer a
 
    94   +newer a
 
    95   $ hg evolve --continue
 
    95   $ hg evolve --continue
 
    96   evolving 4:3655f0f50885 "newer a"
 
       
    97   abort: unresolved merge conflicts (see 'hg help resolve')
 
    96   abort: unresolved merge conflicts (see 'hg help resolve')
 
    98   [255]
 
    97   [255]
 
    99   $ hg resolve -m a
 
    98   $ hg resolve -m a
 
   100   (no more unresolved files)
 
    99   (no more unresolved files)
 
   101   continue: hg evolve --continue
 
   100   continue: hg evolve --continue
evolve