summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-9/+12
|\
| * diff: fix "multiple regexp" semantics to find hunk header commentJunio C Hamano2008-09-201-7/+10
| * Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixJunio C Hamano2008-09-181-2/+2
| |\
| | * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-181-2/+2
* | | Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-291-0/+20
|\ \ \ | |/ / |/| |
| * | merge.conflictstyle: choose between "merge" and "diff3 -m" stylesJunio C Hamano2008-08-301-0/+20
| |/
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-141-5/+18
* | Use strbuf for struct xdiff_emit_state's remainderBrian Downing2008-08-131-22/+10
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-131-1/+12
|/
* Merge branch 'maint'Junio C Hamano2008-03-141-2/+2
|\
| * merge-file: handle empty files gracefullyJohannes Schindelin2008-03-131-2/+2
* | Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-221-2/+1
|/
* Re(-re)*fix trim_common_tail()Linus Torvalds2007-12-201-4/+7
* Re-re-re-fix common tail optimizationJunio C Hamano2007-12-161-1/+1
* trim_common_tail: brown paper bag fix.Jeff King2007-12-161-5/+4
* xdiff tail trimming: use correct type.Junio C Hamano2007-12-141-3/+2
* xdi_diff: trim common trailing linesJunio C Hamano2007-12-131-1/+33
* xdl_diff: identify call sites.Junio C Hamano2007-12-131-0/+5
* Per-path attribute based hunk header selection.Junio C Hamano2007-07-061-0/+71
* War on whitespaceJunio C Hamano2007-06-071-2/+0
* Move buffer_is_binary() to xdiff-interface.hJohannes Schindelin2007-06-041-0/+8
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-071-3/+5
* move read_mmfile() into xdiff-interfaceJohannes Schindelin2006-12-211-0/+19
* Use xrealloc instead of reallocJonas Fonseca2006-08-261-6/+6
* Match ofs/cnt types in diff interface.Junio C Hamano2006-04-061-4/+4
* combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-051-0/+46
* combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-051-0/+58
View Lorry Controller Status