mergetools / gvimdiff3on commit Merge branch 'dt/name-hash-dir-entry-fix' (69fe318)
   1. "$MERGE_TOOLS_DIR/vimdiff"