mergetools / gvimdiff3on commit builtin/notes: improve naming (bebf5c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"