mergetools / gvimdiffon commit Merge branch 'jc/conf-var-doc' into maint (c11c154)
   1. "$MERGE_TOOLS_DIR/vimdiff"