Merge branch 'jc/maint-diff-core-safecrlf' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"