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/tutorial.t
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 11 Jan 2018 18:36:05 +0530
changeset 3395 02192ac8ef98
parent 764 4a74288c671c
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:
764
4a74288c671c doc: use a symbolic link to point to the tutorial
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 654
diff changeset 
     1
 
../../tests/test-tutorial.t
evolve