Merge branch 'mk/diff-delta-avoid-large-offset'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"