Code

Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()