On Mon, 2016-08-22 at 11:00 +0300, Yaron Cohen-Tal wrote: > Hi, > > What does that mean? You have a complicated merge that can be resolved in multiple ways, we pick the one that's "safest". https://www.mercurial-scm.org/wiki/BidMerge -- Mathematics is the supreme nostalgia of our time.