merge-recursive: use strbuf_expand() instead of interpolate()

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 7472d3ecc9b8412a697a64c1307259a104e0abf9..0e988f2a0081803f5ee30adbf7a548c2c8a00a05 100644 (file)
--- 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"