Merge branch 'wk/doc-in-linux-3.x-era'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"