t / t5100 / msg0011on commit traverse_trees(): handle D/F conflict case sanely (1ee2657)
   1Here comes a commit log message, and
   2its second line is here.