diff options
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" |