view .hg-format-source @ 5782:72f65a647203

divergence-resolution: take parent successors in account If the parent were rewritten we need to take them in accound, but to help with resolution of a stack and to have a better 3 way merge. Changes in test file reflect the new behavior.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 22 Jan 2021 05:37:43 +0100
parents 48b30ff742cb
children
line wrap: on
line source

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