Merge branch 'jn/config-ignore-inaccessible' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"