Merge branch 'la/trailer-cleanups'

Fix to an already-graduated topic.

* la/trailer-cleanups:
  trailer: fix comment/cut-line regression with opts->no_divider

diff --cc t/t7502-commit-porcelain.sh
Simple merge

diff --cc t/t7513-interpret-trailers.sh
Simple merge

diff --cc trailer.c
Simple merge