Fix off-by-one in new three-way-merge updates

diff --git a/delta.c b/delta.c
index 05ef7fd6e4e06206fe60078c05cd054ab1254060..b31957a1d38046b9ead2569bbdd59be061f0157b 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -5,7 +5,6 @@
 #include "tag.h"
 #include "delta.h"
 #include "cache.h"
-#include <string.h>
 
 /* the delta object definition (it can alias any other object) */
 struct delta {