view .hg-format-source @ 5588:5cbb1f356137

unstable-list: add split and fold in content-divergence resolution

This patch adds the current status of divergence resolution when one of
the divergent changeset is a part of split or fold.

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}