mergetools / vimdiff2on commit Merge branch 'jc/maint-diff-core-safecrlf' into maint (82ec54d)
   1. "$MERGE_TOOLS_DIR/vimdiff"