mergetools / vimdiff2on commit Merge branch 'ks/t7508-indent-fix' (6968ca9)
   1. "$MERGE_TOOLS_DIR/vimdiff"