Conflicts: src/Makefile.dep src/aof.c src/redis-cli.c tests/instances.tcl tests/integration/replication.tcl