Merge branch 'dl/switch-c-option-in-error-message'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"