mergetools / vimdiff2on commit Merge branch 'hv/t5526-andand-chain-fix' into next (fa95053)
   1. "$MERGE_TOOLS_DIR/vimdiff"