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 1745 6c922448ccec
parent 1737 5383671ef612
child 1746 343298df3f26
child 1753 9fd15f27c91c
equal deleted inserted replaced
1742:970a4c13ebc3 1745:6c922448ccec 
    96    a
 
    96    a
 
    97   +a
 
    97   +a
 
    98   +newer a
 
    98   +newer a
 
    99   $ hg evolve --continue
 
    99   $ hg evolve --continue
 
   100   grafting 5:3655f0f50885 "newer a"
 
   100   grafting 5:3655f0f50885 "newer a"
 
   101   abort: unresolved merge conflicts (see "hg help resolve")
 
   101   abort: unresolved merge conflicts (see 'hg help resolve')
 
   102   [255]
 
   102   [255]
 
   103   $ hg resolve -m a
 
   103   $ hg resolve -m a
 
   104   (no more unresolved files)
 
   104   (no more unresolved files)
 
   105   $ hg evolve --continue
 
   105   $ hg evolve --continue
 
   106   grafting 5:3655f0f50885 "newer a"
 
   106   grafting 5:3655f0f50885 "newer a"
evolve