mergetools / vimdiff3on commit Merge branch 'rs/commit-parsing-optim' into maint (d6bc22e)
   1. "$MERGE_TOOLS_DIR/vimdiff"