Merging upstream version 1.9.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 0 deletions

diff --git a/iredis/data/commands/zunion.md b/iredis/data/commands/zunion.md
new file mode 100644
index 0000000..71f737b
--- /dev/null
+++ b/iredis/data/commands/zunion.md
@@ -0,0 +1,21 @@
+This command is similar to `ZUNIONSTORE`, but instead of storing the resulting
+sorted set, it is returned to the client.
+
+For a description of the `WEIGHTS` and `AGGREGATE` options, see `ZUNIONSTORE`.
+
+@return
+
+@array-reply: the result of union (optionally with their scores, in case the
+`WITHSCORES` option is given).
+
+@examples
+
+```cli
+ZADD zset1 1 "one"
+ZADD zset1 2 "two"
+ZADD zset2 1 "one"
+ZADD zset2 2 "two"
+ZADD zset2 3 "three"
+ZUNION 2 zset1 zset2
+ZUNION 2 zset1 zset2 WITHSCORES
+```