mergetools / vimdiff3on commit completion: fix __gitcomp_builtin no longer consider extra options (276b49f)
   1. "$MERGE_TOOLS_DIR/vimdiff"