diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2008-11-23 00:13:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-24 04:55:52 +0100 |
| commit | ced621b2c15c3d3dd65dd1d7eec984f8546a4673 (patch) | |
| tree | 332d3af816ed077b58c81a5beb459655008fb740 /merge-recursive.c | |
| parent | add strbuf_expand_dict_cb(), a helper for simple cases (diff) | |
| download | git-ced621b2c15c3d3dd65dd1d7eec984f8546a4673.tar.xz git-ced621b2c15c3d3dd65dd1d7eec984f8546a4673.zip | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 0 insertions, 1 deletions
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" |