mergetools / vimdiff3on commit Merge branch 'rj/git-version-gen-do-not-force-abbrev' (0a45050)
   1. "$MERGE_TOOLS_DIR/vimdiff"