mergetools / vimdiff2on commit Merge branch 'hv/config-from-blob' (55fefe6)
   1. "$MERGE_TOOLS_DIR/vimdiff"