From dcde5720424961f526e8c070b7d99191d7ef75c1 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 9 Nov 2015 08:23:27 -0500 Subject: merge tests: move expected data into own file --- tests/merge/trees/automerge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/merge/trees/automerge.c') diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c index c18881d7c..67f2cf786 100644 --- a/tests/merge/trees/automerge.c +++ b/tests/merge/trees/automerge.c @@ -3,8 +3,9 @@ #include "git2/merge.h" #include "buffer.h" #include "merge.h" -#include "../merge_helpers.h" #include "fileops.h" +#include "../merge_helpers.h" +#include "../conflict_data.h" static git_repository *repo; -- cgit v1.2.1