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 --combined wt-status.c
index ac972acbab9650266c19c16e6a761903ff21250c,23e87e74dc5820f0fe1536e05a369d778961af83..6f730ee8f22b958c7502656d2e1d01ea1f932396
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
@@@ -934,7 -934,7 +934,7 @@@ size_t wt_status_locate_end(const char 
  
  void wt_status_add_cut_line(FILE *fp)
  {
-       const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
+       const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
        struct strbuf buf = STRBUF_INIT;
  
        fprintf(fp, "%c %s", comment_line_char, cut_line);
@@@ -1026,7 -1026,6 +1026,7 @@@ static void wt_longstatus_print_trackin
                                 comment_line_char);
        else
                fputs("\n", s->fp);
 +      strbuf_release(&sb);
  }
  
  static int has_unmerged(struct wt_status *s)
@@@ -1194,7 -1193,6 +1194,7 @@@ static int read_rebase_todolist(const c
                string_list_append(lines, line.buf);
        }
        fclose(f);
 +      strbuf_release(&line);
        return 0;
  }