Merge branch 'jk/capabilities-doc'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"