mergetools / vimdiff2on commit Merge branch 'pw/sequence-rerere-autoupdate' into next (010cbb0)
   1. "$MERGE_TOOLS_DIR/vimdiff"