t / t5100 / patch0007on commit apply.c: fix whitespace-only mismerge (e294e89)
   1