diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-09 08:23:27 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:38:22 -0500 |
| commit | dcde5720424961f526e8c070b7d99191d7ef75c1 (patch) | |
| tree | 5dcd085a370ce66bb9cd39aa280e61676716ef57 /tests/merge/trees/automerge.c | |
| parent | 76ade3a0b87e279935eba54be2485105396edb7f (diff) | |
| download | libgit2-dcde5720424961f526e8c070b7d99191d7ef75c1.tar.gz | |
merge tests: move expected data into own file
Diffstat (limited to 'tests/merge/trees/automerge.c')
| -rw-r--r-- | tests/merge/trees/automerge.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |