Merge branch 'jk/color-diff-plain-is-context' into maint
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"