diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:24:36 -0800 |
| commit | 2d2b3fd8485eee6dd238b930f2592535730089a4 (patch) | |
| tree | 642dc8866db7840ef247164bee3435cf805ee03e /merge-recursive.c | |
| parent | Merge branch 'mv/clone-strbuf' (diff) | |
| parent | remove the unused files interpolate.c and interpolate.h (diff) | |
| download | tgif-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.xz | |
Merge branch 'rs/strbuf-expand'
* rs/strbuf-expand:
remove the unused files interpolate.c and interpolate.h
daemon: deglobalize variable 'directory'
daemon: inline fill_in_extra_table_entries()
daemon: use strbuf_expand() instead of interpolate()
merge-recursive: use strbuf_expand() instead of interpolate()
add strbuf_expand_dict_cb(), a helper for simple cases
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" |