Merge branch 'sb/t5400-remove-unused'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"