Merge branch 'ap/strbuf-humanize'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"