Merge branch 'dg/document-git-c-in-git-config-doc'
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"