mergetools / vimdiff2on commit Merge branch 'mg/cherry-pick-multi-on-unborn' into maint (25227f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"