evolve: rename some variable ahead of time A refactoring of the content divergence resolution in on its way. use a distinctive name for some variable early to make the change easier to read later.

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