Merge branch 'we/submodule-update-prefix-output' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"