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