Merge branch 'am/visual-studio-config-fix'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"