summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
AgeCommit message (Expand)Author
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