Mercurial > hg
diff mercurial/bitmanipulation.h @ 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 | 1fb2510cf8c8 |
children | eed42f1c22d6 |