From 4f74dfd45f857eb33ca3ad140611a9b4df9ebea0 Mon Sep 17 00:00:00 2001
From: sears <sears@8dad8b1f-cf64-0410-95b6-bcf113ffbcfe>
Date: Fri, 22 Apr 2011 17:39:52 +0000
Subject: [PATCH] documentation cleanup

git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@2448 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
---
 tuplemerger.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tuplemerger.cpp b/tuplemerger.cpp
index ed31a1d..e3c723f 100644
--- a/tuplemerger.cpp
+++ b/tuplemerger.cpp
@@ -1,7 +1,8 @@
 #include "tuplemerger.h"
 #include "logstore.h"
 
-// XXX test / reason about this...
+// t2 is the newer tuple.
+// we return deletes here.  our caller decides what to do with them.
 datatuple* tuplemerger::merge(const datatuple *t1, const datatuple *t2)
 {
     datatuple *t;
@@ -21,9 +22,7 @@ datatuple* tuplemerger::merge(const datatuple *t1, const datatuple *t2)
     }
     
     return t;
-    
 }
-
 /**
  * appends the data in t2 to data from t1
  *