diff mercurial/linelog.py @ 49965:3aa8e569478a

merge: don't pay for pathconflicts if there are none
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Wed, 04 Jan 2023 19:13:41 +0000
parents d44e3c45f0e4
children 011eec5a66b2
line wrap: on
line diff