three-way-merge

Wikipedia says a 3-way merge is less error-prone than a 2-way merge, and often times doesn’t need user intervention. Why is this the case? An example where a 3-way...