Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"