gitweb / test / file+plus+signon commit git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (f91333d)
   1This
   2filename
   3contains
   4+
   5plus
   6chars.