Mercurial > evolve

annotate .hg-format-source @ 5514:4c3656aaacc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make sure we don't miss merging content of divergent changesets It was skipping _mergecontentdivergents() in the continue case of content-divergence when we hit merge conflict in relocation of "divergent" and relocation of "other" is not required. And because of this skip, merging the content of two divergent changesets was not performed correctly. Changes in test file reflect the fixed behavior.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Mon, 31 Aug 2020 01:10:58 +0530
parents 48b30ff742cb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4814
48b30ff742cb python3: use format-source to run byteify-strings in .py files
Raphaël Gomès <rgomes@octobus.net>
parents:
diff changeset
1 {"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}