Merge branch 'nd/add-i-ignore-submodules' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"