diff mercurial/scmposix.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 7a4143428db7
children 18c8c18993f0
line wrap: on
line diff