mergetools / gvimdiff3on commit Merge branch 'js/difftool-builtin' (7b612c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"