Merge branch 'jk/doc-build-move-infordir-def'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"