mergetools / gvimdiff2on commit Merge branch 'jk/config-path-include-fix' into maint (6f01667)
   1. "$MERGE_TOOLS_DIR/vimdiff"