mergetools / gvimdiffon commit Merge branch 'jk/color-diff-plain-is-context' into maint (6998d89)
   1. "$MERGE_TOOLS_DIR/vimdiff"