mergetools / vimdiff3on commit Merge branch 'bp/name-hash-dirname-fix' (2ac76d8)
   1. "$MERGE_TOOLS_DIR/vimdiff"