mergetools / gvimdiff2on commit Merge branch 'js/close-packs-before-gc' (68846a9)
   1. "$MERGE_TOOLS_DIR/vimdiff"