mergetools / gvimdiffon commit Merge branch 'sr/log-SG-no-textconv' into maint (283c63f)
   1. "$MERGE_TOOLS_DIR/vimdiff"