Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"