mergetools / gvimdiffon commit Merge branch 'jc/compression-config' into maint (bdc370a)
   1. "$MERGE_TOOLS_DIR/vimdiff"