Merge branch 'ak/add-i-empty-candidates' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"