Mercurial > evolve

annotate docs/figures/hgview-example.png @ 3801:ee78135b2f45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: merge commit messages while resolving content-divergence (issue5877) While resolving content-divergence, there can be divergence in commit messages too which should be resolved. This patch uses the hg's internal merge API's to merge commit messages of divergent changesets with predecessor as the base. In case of conflicts, we fallback to divergent's commit message which should be changed in future. We should pop up the editor with the commit message and the conflict markers and let user fix that. Tests are added for the functionality added.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 04 Jun 2018 01:28:02 +0530
parents 404e926658bc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
506
404e926658bc doc: add missing image
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
1 (binary:image/png)