summaryrefslogtreecommitdiff
path: root/src/diff_xdiff.h
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2015-11-24 15:19:59 -0500
committerEdward Thomson <ethomson@github.com>2016-05-26 13:01:08 -0500
commit8d44f8b78f7929c86b9e37acfe40fe707815bca6 (patch)
tree3cc10ccde05acd66e67a9d196bcc105e1190cdfe /src/diff_xdiff.h
parent53571f2f0c5cbb30e86aa0b8095f51c09c85761e (diff)
downloadlibgit2-8d44f8b78f7929c86b9e37acfe40fe707815bca6.tar.gz
patch: `patch_diff` -> `patch_generated`
Diffstat (limited to 'src/diff_xdiff.h')
-rw-r--r--src/diff_xdiff.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/diff_xdiff.h b/src/diff_xdiff.h
index e1c58a229..88375986b 100644
--- a/src/diff_xdiff.h
+++ b/src/diff_xdiff.h
@@ -9,19 +9,19 @@
#include "diff.h"
#include "xdiff/xdiff.h"
-#include "patch_diff.h"
+#include "patch_generate.h"
/* xdiff cannot cope with large files. these files should not be passed to
* xdiff. callers should treat these large files as binary.
*/
#define GIT_XDIFF_MAX_SIZE (1024LL * 1024 * 1023)
-/* A git_xdiff_output is a git_patch_diff_output with extra fields necessary
- * to use libxdiff. Calling git_xdiff_init() will set the diff_cb field
- * of the output to use xdiff to generate the diffs.
+/* A git_xdiff_output is a git_patch_generate_output with extra fields
+ * necessary to use libxdiff. Calling git_xdiff_init() will set the diff_cb
+ * field of the output to use xdiff to generate the diffs.
*/
typedef struct {
- git_patch_diff_output output;
+ git_patch_generated_output output;
xdemitconf_t config;
xpparam_t params;