mergetools / gvimdiffon commit Merge branch 'sb/repack-in-c' into maint (90791e3)
   1. "$MERGE_TOOLS_DIR/vimdiff"