Merge branch 'sg/complete-configuration-variables'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"