diff mercurial/localrepo.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 ff7134e03629
children 376395868b7b
line wrap: on
line diff