mergetools / vimdiff2on commit Merge branch 'rs/lose-leak-pending' into maint (e17cec2)
   1. "$MERGE_TOOLS_DIR/vimdiff"