mergetools / gvimdiff3on commit notes: use a strbuf in add_non_note (c29edfe)
   1. "$MERGE_TOOLS_DIR/vimdiff"