diff options
| author | Edward Thomson <ethomson@github.com> | 2016-04-19 15:12:18 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-05-26 13:01:08 -0500 |
| commit | 9be638ecf0d64ec98b3fd16f2d983a86d1aca131 (patch) | |
| tree | a38e7aecf3c0d1eb2b77bb0baa6a3c3ca519fee2 /src/merge.c | |
| parent | aa4bfb32b9662ab47b056a74211636d427f35a43 (diff) | |
| download | libgit2-9be638ecf0d64ec98b3fd16f2d983a86d1aca131.tar.gz | |
git_diff_generated: abstract generated diffs
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.c b/src/merge.c index b93851b7e..6934aa731 100644 --- a/src/merge.c +++ b/src/merge.c @@ -18,6 +18,8 @@ #include "iterator.h" #include "refs.h" #include "diff.h" +#include "diff_generate.h" +#include "diff_tform.h" #include "checkout.h" #include "tree.h" #include "blob.h" |