mergetools / gvimdiff2on commit Merge branch 'jk/shortlog-tolerate-broken-commit' into maint (77bc430)
   1. "$MERGE_TOOLS_DIR/vimdiff"