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/figures/hgview-example.png
author Sushil khanchi <sushilkhanchi97@gmail.com>
Wed, 10 Apr 2019 15:37:29 +0200
branchstable
changeset 4483 7978230faa32
parent 506 404e926658bc
permissions -rw-r--r--
evolve: make sure div resolution don't replace the initial author (issue6113) Before this patch, divergence resolution logic taking the current user who is running the resolution command as the author of commit that will be created after merging the two divergent csets. This patch make sure that we preserve the initial author. Changes in test file reflect the fixed behaviour.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
506
404e926658bc doc: add missing image
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
(binary:image/png)
evolve