mergetools / gvimdiffon commit Merge branch 'bp/name-hash-dirname-fix' into next (2f564fb)
   1. "$MERGE_TOOLS_DIR/vimdiff"