summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
AgeCommit message (Expand)Author
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King
2018-11-05diff: avoid generating unused hunk header linesJeff King
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King
2017-10-26xdiff-interface: export comparing and hashing stringsStefan Beller
2016-09-07Convert read_mmblob to take struct object_id.brian m. carlson
2015-09-28xdiff: reject files larger than ~1GBJeff King
2012-05-09xdiff: remove emit_func() and xdi_diff_hunks()René Scharfe
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov
2009-07-02userdiff: add xdiff_clear_find_func()René Scharfe
2008-10-25add xdi_diff_hunks() for callers that only need hunk lengthsRené Scharfe
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano
2008-09-19diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey
2008-08-31merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano
2008-08-14Use strbuf for struct xdiff_emit_state's remainderBrian Downing
2008-08-14Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-07-06Per-path attribute based hunk header selection.Junio C Hamano
2007-06-05Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin
2006-12-22move read_mmfile() into xdiff-interfaceJohannes Schindelin
2006-04-07Match ofs/cnt types in diff interface.Junio C Hamano
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano