Mercurial Mercurial > pub > hg > evolve / annotate
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.
docs/tutorials/topic-tutorial.t
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 18:36:05 +0530
changeset 3395 02192ac8ef98
parent 2824 d0e3a8e0b62c
permissions lrwxrwxrwx
evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2824
d0e3a8e0b62c docs: move the topic tutorial in the documentation
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     1
 
../../tests/test-topic-tutorial.t
evolve