Merge branch 'sv/submitting-final-patch'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"