t / t5100 / info0011on commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Author: A U Thor
   2Email: a.u.thor@example.com
   3Subject: Xyzzy
   4Date: Fri, 8 Aug 2008 13:08:37 +0200 (CEST)
   5