mergetools / gvimdiffon commit Merge branch 'jk/make-fix-dependencies' into maint (5fd7227)
   1. "$MERGE_TOOLS_DIR/vimdiff"