Merge conflicts resolved.

diff --cc redis.conf
Simple merge

diff --cc src/aof.c
Simple merge

diff --cc src/config.c
index 8d8fcda74e745ab1ce83e9f70b837a1aae34f290,26bb2ff5e86838ffac337dffd922ada39db229ce..d84cd474dd12b4eb855f6cf1e2e8baa29bf9199c
--- 1/src/config.c
--- 2/src/config.c
+++ b/src/config.c
@@@ -667,66 -561,6 +673,66 @@@ void configGetCommand(redisClient *c) 
      int matches = 0;
      redisAssertWithInfo(c,o,o->encoding == REDIS_ENCODING_RAW);
  
-     config_get_numerical_field("hash-max-zipmap-entries",
-             server.hash_max_zipmap_entries);
-     config_get_numerical_field("hash-max-zipmap-value",
-             server.hash_max_zipmap_value);
 +    /* String values */
 +    config_get_string_field("dbfilename",server.rdb_filename);
 +    config_get_string_field("requirepass",server.requirepass);
 +    config_get_string_field("masterauth",server.requirepass);
 +    config_get_string_field("bind",server.bindaddr);
 +    config_get_string_field("unixsocket",server.unixsocket);
 +    config_get_string_field("logfile",server.logfile);
 +    config_get_string_field("pidfile",server.pidfile);
 +
 +    /* Numerical values */
 +    config_get_numerical_field("maxmemory",server.maxmemory);
 +    config_get_numerical_field("maxmemory-samples",server.maxmemory_samples);
 +    config_get_numerical_field("timeout",server.maxidletime);
 +    config_get_numerical_field("auto-aof-rewrite-percentage",
 +            server.aof_rewrite_perc);
 +    config_get_numerical_field("auto-aof-rewrite-min-size",
 +            server.aof_rewrite_min_size);
++    config_get_numerical_field("hash-max-ziplist-entries",
++            server.hash_max_ziplist_entries);
++    config_get_numerical_field("hash-max-ziplist-value",
++            server.hash_max_ziplist_value);
 +    config_get_numerical_field("list-max-ziplist-entries",
 +            server.list_max_ziplist_entries);
 +    config_get_numerical_field("list-max-ziplist-value",
 +            server.list_max_ziplist_value);
 +    config_get_numerical_field("set-max-intset-entries",
 +            server.set_max_intset_entries);
 +    config_get_numerical_field("zset-max-ziplist-entries",
 +            server.zset_max_ziplist_entries);
 +    config_get_numerical_field("zset-max-ziplist-value",
 +            server.zset_max_ziplist_value);
 +    config_get_numerical_field("lua-time-limit",server.lua_time_limit);
 +    config_get_numerical_field("slowlog-log-slower-than",
 +            server.slowlog_log_slower_than);
 +    config_get_numerical_field("slowlog-max-len",
 +            server.slowlog_max_len);
 +    config_get_numerical_field("port",server.port);
 +    config_get_numerical_field("databases",server.dbnum);
 +    config_get_numerical_field("repl-ping-slave-period",server.repl_ping_slave_period);
 +    config_get_numerical_field("repl-timeout",server.repl_timeout);
 +    config_get_numerical_field("maxclients",server.maxclients);
 +
 +    /* Bool (yes/no) values */
 +    config_get_bool_field("no-appendfsync-on-rewrite",
 +            server.aof_no_fsync_on_rewrite);
 +    config_get_bool_field("slave-serve-stale-data",
 +            server.repl_serve_stale_data);
 +    config_get_bool_field("stop-writes-on-bgsave-error",
 +            server.stop_writes_on_bgsave_err);
 +    config_get_bool_field("daemonize", server.daemonize);
 +    config_get_bool_field("rdbcompression", server.rdb_compression);
 +    config_get_bool_field("activerehashing", server.activerehashing);
 +
 +    /* Everything we can't handle with macros follows. */
 +
 +    if (stringmatch(pattern,"appendonly",0)) {
 +        addReplyBulkCString(c,"appendonly");
 +        addReplyBulkCString(c,server.aof_state == REDIS_AOF_OFF ? "no" : "yes");
 +        matches++;
 +    }
      if (stringmatch(pattern,"dir",0)) {
          char buf[1024];
  

diff --cc src/rdb.c
Simple merge

diff --cc src/redis.c
Simple merge

diff --cc src/redis.h
Simple merge

diff --cc src/t_hash.c
Simple merge

diff --cc src/util.c
Simple merge

diff --cc src/ziplist.c
Simple merge

diff --cc tests/unit/type/hash.tcl
Simple merge