Mercurial Mercurial > mercurial / 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-graft.t
changeset 38341 50f5fc232c16
parent 38311 47f5454a30ed
child 38453 5cdfc20bfd5f
equal deleted inserted replaced
38340:9abe91a503da 38341:50f5fc232c16 
   234   # 
   234   # 
   235   #     e
 
   235   #     e
 
   236   # 
   236   # 
   237   # To mark files as resolved:  hg resolve --mark FILE
 
   237   # To mark files as resolved:  hg resolve --mark FILE
 
   238   
   238   
   239   # To continue:                hg graft --continue
 
   239   # To continue:    hg graft --continue
 
   240   # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)
 
   240   # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
 
   241   
   241   
   242 
   242 
   243 Commit while interrupted should fail:
 
   243 Commit while interrupted should fail:
 
   244 
   244 
   245   $ hg ci -m 'commit interrupted graft'
 
   245   $ hg ci -m 'commit interrupted graft'
mercurial