diff mercurial/repoview.py @ 45630:588068d5f2da

merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 02 Oct 2020 18:40:39 +0530
parents 5ed6efedc457
children 341e014fe0fb
line wrap: on
line diff