Merge branch 'ks/commit-do-not-touch-cut-line' into next

The explanation of the cut-line in the commit log editor has been
slightly tweaked.

* ks/commit-do-not-touch-cut-line:
commit-template: change a message to be more intuitive

diff --cc wt-status.c
Simple merge