mergetools / gvimdiff2on commit Merge branch 'ml/avoid-using-grep-on-crlf-files' (2bf3501)
   1. "$MERGE_TOOLS_DIR/vimdiff"