Merge branch 'ml/avoid-using-grep-on-crlf-files'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"