Merge branch 'jk/coding-guidelines-update'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"