Merge branch 'for-junio' of git://github.com/kusma/git
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"