mergetools / vimdiff2on commit Merge branch 'cb/log-follow-with-combined' into maint (318e758)
   1. "$MERGE_TOOLS_DIR/vimdiff"