t / t5100 / msg0016on commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1and some content
   2