Merge branch 'en/t7406-fixes'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"