From ced621b2c15c3d3dd65dd1d7eec984f8546a4673 Mon Sep 17 00:00:00 2001
From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Sun, 23 Nov 2008 00:13:00 +0100
Subject: merge-recursive: use strbuf_expand() instead of interpolate()

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 merge-recursive.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'merge-recursive.c')

diff --git a/merge-recursive.c b/merge-recursive.c
index 7472d3ecc9..0e988f2a00 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -16,7 +16,6 @@
 #include "string-list.h"
 #include "xdiff-interface.h"
 #include "ll-merge.h"
-#include "interpolate.h"
 #include "attr.h"
 #include "merge-recursive.h"
 #include "dir.h"
-- 
cgit v1.2.3