Merge branch 'rs/shortlog-cleanup' into next
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"