mergetools / gvimdiff2on commit Merge branch 'js/gc-with-stale-symref' into maint (b05c2f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"