X-Git-Url: http://git.kpe.io/?p=memstore.git;a=blobdiff_plain;f=memcache%2FREADME.md;h=6c172014792125f0dff11d498ba6694ea5c9aa85;hp=4106eec38952b5d4704304e7351588018da7d102;hb=f72989f5a590de4f00a0f830e143b7a5782d26ed;hpb=ef7ec94c1f67f7e0733774564a4ed848ff169eba

diff --git a/memcache/README.md b/memcache/README.md
index 4106eec..6c17201 100644
--- a/memcache/README.md
+++ b/memcache/README.md
@@ -7,13 +7,22 @@ Author: Kevin Rosenberg <kevin@rosenberg.net>, based on the
 `cl-memcached` library by Abhijit 'quasi' Rao and 
 Chaitanya Gupta .
 
+Date Started: July 1, 2011
+
 Overview
 --------
 
+<<<<<<< HEAD
+This package is based on the `cl-memcached` library.
+It is substantially modified for use with the memstore
+package. The primary areas of additional functionality
+are:
+=======
 This package is based on the cl-memcached library.  It is
 substantially modified for use with the
 [memstore](http://memstore.b9.com) library. The primary areas of
 additional functionality are:
+>>>>>>> ef7ec94c1f67f7e0733774564a4ed848ff169eba
 
 * Support for flags field with get and set functions.
   This is required as memstore stores bit flags denoting
@@ -51,5 +60,13 @@ additional functionality are:
   functions as well as utilitizing other `kmrcl` functions to simplify
   code.
 
-* Nearly the entire code base has been reworked for improved
-  robustness and efficiency.
+* Added functions to support all memcached API commands,
+  such as `flush_all` and `version`.
+
+* Support for the `moreply` command argument accepted by
+  many commands.
+
+* Support the `noreply` argument that many API commands accept.
+
+* Write nearly the entire code base for improved
+  clarity, robustness, and efficiency.