aboutsummaryrefslogtreecommitdiff
path: root/xdiff-interface.h
Commit message (Expand)AuthorAge
* merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-30
* 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