gitweb / test / file+plus+signon commit git-revert with conflicts to behave as git-merge with conflicts (a9cb3c6)
   1This
   2filename
   3contains
   4+
   5plus
   6chars.