t / t5100 / rfc2047-info-0001on commit test that git status works with merge conflict in, .gitmodules (44ca0c8)
   1Author: Keith Moore
   2Email: moore@cs.utk.edu
   3Subject: If you can read this you understand the example.
   4