Merge branch 'dk/maint-t5150-dirname' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"