mergetools / gvimdiff2on commit Merge branch 'es/chain-lint-more' (ace1f99)
   1. "$MERGE_TOOLS_DIR/vimdiff"