Clemens Buchacher <drizzd@xxxxxx> writes: >> Reading the rest of the function, I notice that it consistently favor "a" >> over "b", when a conflict cannot be reconciled. > > Indeed. I think "b" should be favored over "a", however. Why? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
