diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-04 22:20:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-04 22:20:47 (GMT) |
| commit | 6b6f5d4664c9088636418653a61f600b5e3a9ea4 (patch) | |
| tree | 8e9f5db3e5efb83423784509a3154c1b11022bfa /xdiff-interface.h | |
| parent | 2b873e064c4eac816887f823c1dfefbc9c3b4b0e (diff) | |
| parent | dfea79004c54bc96143386d6ac22de500ba4f747 (diff) | |
| download | git-6b6f5d4664c9088636418653a61f600b5e3a9ea4.zip git-6b6f5d4664c9088636418653a61f600b5e3a9ea4.tar.gz git-6b6f5d4664c9088636418653a61f600b5e3a9ea4.tar.bz2 | |
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index abba70c..49d1116 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -9,8 +9,7 @@ typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, 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, xdemitcb_t *xecb); + xpparam_t const *xpp, xdemitconf_t const *xecfg); int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2, xdiff_emit_hunk_consume_fn fn, void *consume_callback_data, xpparam_t const *xpp, xdemitconf_t *xecfg); |