Merge branch 'ss/submodule-summary-in-c'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"