Merge branch 'jk/tag-h-column-is-a-listing-option' into maint
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"