Merge branch 'nd/index-pack-l10n-buf-overflow'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"