Merge branch 'jk/common-make-variables-export-safety'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"