Merge branch 'sb/t3600-cleanup'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"