From 3350558346a07600bb7529781638696e04c425cc Mon Sep 17 00:00:00 2001
From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 7 May 2010 16:48:43 +0200
Subject: [PATCH] change command names no longer used to zunion/zinter

---
 redis-cli.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/redis-cli.c b/redis-cli.c
index 5410f026..98e9bdf1 100644
--- a/redis-cli.c
+++ b/redis-cli.c
@@ -112,8 +112,8 @@ static struct redisCommand cmdTable[] = {
     {"zincrby",4,CMDFLAG_NONE},
     {"zrem",3,CMDFLAG_NONE},
     {"zremrangebyscore",4,CMDFLAG_NONE},
-    {"zmerge",-3,CMDFLAG_NONE},
-    {"zmergeweighed",-4,CMDFLAG_NONE},
+    {"zunion",-4,CMDFLAG_NONE},
+    {"zinter",-4,CMDFLAG_NONE},
     {"zrange",-4,CMDFLAG_NONE},
     {"zrank",3,CMDFLAG_NONE},
     {"zrevrank",3,CMDFLAG_NONE},
-- 
2.47.2