Merge branch 'ds/sparse-list-in-cone-mode'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"