Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/xdiff-interface.h
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
31 lines (25 sloc)
1.14 KB
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#ifndef XDIFF_INTERFACE_H | |
#define XDIFF_INTERFACE_H | |
#include "xdiff/xdiff.h" | |
/* | |
* xdiff isn't equipped to handle content over a gigabyte; | |
* we make the cutoff 1GB - 1MB to give some breathing | |
* room for constant-sized additions (e.g., merge markers) | |
*/ | |
#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023) | |
typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); | |
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); | |
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, | |
xdiff_emit_consume_fn fn, void *consume_callback_data, | |
xpparam_t const *xpp, xdemitconf_t const *xecfg); | |
int parse_hunk_header(char *line, int len, | |
int *ob, int *on, | |
int *nb, int *nn); | |
int read_mmfile(mmfile_t *ptr, const char *filename); | |
void read_mmblob(mmfile_t *ptr, const unsigned char *sha1); | |
int buffer_is_binary(const char *ptr, unsigned long size); | |
extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags); | |
extern void xdiff_clear_find_func(xdemitconf_t *xecfg); | |
extern int git_xmerge_config(const char *var, const char *value, void *cb); | |
extern int git_xmerge_style; | |
#endif |