Some people use different merge strategy for single file(merge=union). It is good idea to go when every line of your changelog are always unique. It is bad idea when your changelog has some not-so-unique endings. Things then can just go wrong. And nobody will notice it. All similar stirngs can be silently merged into one during conflict resolution.
Let’s start at the bottom: People who make lots of little bets on many potential unicorns have christened themselves angels. Angels? Really? You’ve plucked your self-serving moniker from the parables of a religion that specifically and explicitly had its head honcho throw the money men out of the temple and proclaim a rich man less likely to make it into heaven than a camel through a needle’s eye. Okay then!