mergetools / vimdiff2on commit Merge branch 'en/rerere-multi-stage-1-fix' into maint (b4eafbc)
   1. "$MERGE_TOOLS_DIR/vimdiff"