gitweb / test / file+plus+signon commit apply: check D/F conflicts more carefully. (c28c571)
   1This
   2filename
   3contains
   4+
   5plus
   6chars.