mergetools / vimdiff2on commit Merge branch 'ad/bisect-terms' into maint (2ae2362)
   1. "$MERGE_TOOLS_DIR/vimdiff"