mergetools / gvimdiffon commit Merge branch 'dt/name-hash-dir-entry-fix' into maint (3a27eec)
   1. "$MERGE_TOOLS_DIR/vimdiff"