mergetools / gvimdiff3on commit trailer: display a trailer without its trailing newline (d52adf1)
   1. "$MERGE_TOOLS_DIR/vimdiff"