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