Merge branch 'jk/make-findstring-makeflags-fix' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"