Merge branch 'jk/simplify-csum-file-sha1fd-check' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"