aboutsummaryrefslogtreecommitdiff
path: root/xdiff-interface.h
Commit message (Expand)AuthorAge
* Convert read_mmblob to take struct object_id.brian m. carlson2016-09-07
* xdiff: reject files larger than ~1GBJeff King2015-09-28
* xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe2012-05-09
* Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-04
|\
| * remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04
* | refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-17
|/
* userdiff: add xdiff_clear_find_func()René Scharfe2009-07-01
* add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe2008-10-25
* Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-29
|\
| * Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-18
| |\
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-18
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
| |/
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-14
* | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-13
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-13
|/
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-06
* Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-04
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-21
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-06
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-05
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-05