gitweb / test / file+plus+signon commit git-merge: minor fix for no_trivial_merge_strategies. (de6f0de)
   1This
   2filename
   3contains
   4+
   5plus
   6chars.