mergetools / gvimdiffon commit Merge branch 'js/empty-config-section-fix' (2305770)
   1. "$MERGE_TOOLS_DIR/vimdiff"