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