t / test4012.pngon commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
t/test4012.png