|
Last change
on this file since 782 was 782, checked in by dmik, 11 years ago |
|
git: Merge version 2.0.0 from vendor to dmik branch.
|
|
File size:
944 bytes
|
| Line | |
|---|
| 1 | #ifndef XDIFF_INTERFACE_H
|
|---|
| 2 | #define XDIFF_INTERFACE_H
|
|---|
| 3 |
|
|---|
| 4 | #include "xdiff/xdiff.h"
|
|---|
| 5 |
|
|---|
| 6 | typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
|
|---|
| 7 |
|
|---|
| 8 | int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
|
|---|
| 9 | int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
|
|---|
| 10 | xdiff_emit_consume_fn fn, void *consume_callback_data,
|
|---|
| 11 | xpparam_t const *xpp, xdemitconf_t const *xecfg);
|
|---|
| 12 | int parse_hunk_header(char *line, int len,
|
|---|
| 13 | int *ob, int *on,
|
|---|
| 14 | int *nb, int *nn);
|
|---|
| 15 | int read_mmfile(mmfile_t *ptr, const char *filename);
|
|---|
| 16 | void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
|
|---|
| 17 | int buffer_is_binary(const char *ptr, unsigned long size);
|
|---|
| 18 |
|
|---|
| 19 | extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
|
|---|
| 20 | extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
|
|---|
| 21 | extern int git_xmerge_config(const char *var, const char *value, void *cb);
|
|---|
| 22 | extern int git_xmerge_style;
|
|---|
| 23 |
|
|---|
| 24 | #endif
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
