Merge branch 'jk/shortlog-group-by-trailer'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"