Merge branch 'jk/t5000-gzip-simplify'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"