t / t5100 / msg0015on commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1- a list
   2  - of stuff