gitweb / test / file+plus+signon commit Keep rename/rename conflicts of intermediate merges while doing recursive merge (a97e407)
   1This
   2filename
   3contains
   4+
   5plus
   6chars.