Merge branch 'jk/war-on-sprintf' into maint-2.7
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"