From: Nathaniel P Dawson Date: Tue, 31 Mar 2009 09:45:20 GMT Subject: [PATCH 3/4] Header Includes Cleanup Part 2 Message-ID: <1238492721-92484-4-git-send-email-nathaniel.dawson@gmail.com> In-Reply-To: <1238492721-92484-3-git-send-email-nathaniel.dawson@gmail.com> Deleted includes of string-list.h where merge-recursive.h was included since it includes string-list.h. Signed-off-by: Nathaniel P Dawson --- merge-recursive.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 370151e..40d636f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -10,11 +10,10 @@ #include "diffcore.h" #include "tag.h" #include "unpack-trees.h" -#include "string-list.h" +#include "merge-recursive.h" #include "xdiff-interface.h" #include "ll-merge.h" #include "attr.h" -#include "merge-recursive.h" #include "dir.h" static struct tree *shift_tree_object(struct tree *one, struct tree *two) -- 1.6.1.3