t / t5100 / rfc2047-info-0001on commit conflict_rename_delete(): Check whether D/F conflicts are still present (a0de2f6)
   1Author: Keith Moore
   2Email: moore@cs.utk.edu
   3Subject: If you can read this you understand the example.
   4