mergetools / gvimdiffon commit Merge branch 'jc/doc-diff-filter-exclude' into maint (2f8c654)
   1. "$MERGE_TOOLS_DIR/vimdiff"