Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > Ok, it turns out that M is an evil merge, i.e. the file in M is different > from both A and 3, but in such a way that it does not show up in a diff > --cc that has only 3 lines of context. In particular, one of the commits > 1, 2, 3 added a single line at an isolated spot in the file, and I undid > that addition in the merge commit M. > > Sorry for the noise. > > -- Hannes > > (So, *that's* why they are called "evil"!) Just a nomenclature, but independent changes merged trivially cleanly are "normal" merges, not evil. Evil merges are the ones that actually change the result in such a way that new lines in --cc output do not have _any_ counterpart in any of the parents. -- 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
