Merge branch 'jk/ewah-use-right-type-in-sizeof' into maint
[git] / mergetools / gvimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"