diff mercurial/merge.py @ 48865:7caa967bb7b6

tests: simplify Windows and PYTHON3 conditionals PYTHON3 is always True. So this flow can be reduced. Differential Revision: https://phab.mercurial-scm.org/D12243
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 20 Feb 2022 13:27:08 -0700
parents d4486810a179
children 6000f5b25c9b 0cc5f74ff7f0
line wrap: on
line diff