Conflicts: 00-RELEASENOTES deps/linenoise/linenoise.c src/anet.c src/debug.c src/redis-cli.c src/redis.c src/sentinel.c src/t_zset.c
Conflicts: 00-RELEASENOTES deps/linenoise/linenoise.c src/anet.c src/debug.c src/redis-cli.c src/redis.c src/sentinel.c src/t_zset.c