diff mercurial/state.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 8ced4ca30ea1
children 9d3721552b6c
line wrap: on
line diff