| Commit message (Expand) | Author | Age |
* | xdiff: remove emit_func() and xdi_diff_hunks() | René Scharfe | 2012-05-09 |
* | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-04 |
|\ |
|
| * | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 |
* | | refactor duplicated fill_mm() in checkout and merge-recursive | Michael Lukashov | 2010-02-17 |
|/ |
|
* | userdiff: add xdiff_clear_find_func() | René Scharfe | 2009-07-01 |
* | add xdi_diff_hunks() for callers that only need hunk lengths | René Scharfe | 2008-10-25 |
* | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 |
|\ |
|
| * | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 |
| |\ |
|
| | * | diff.c: associate a flag with each pattern and use it for compiling regex | Brandon Casey | 2008-09-18 |
* | | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 |
|\ \ \
| |/ /
|/| | |
|
| * | | merge.conflictstyle: choose between "merge" and "diff3 -m" styles | Junio C Hamano | 2008-08-30 |
| |/ |
|
* | | xdiff-interface: hide the whole "xdiff_emit_state" business from the caller | Junio C Hamano | 2008-08-14 |
* | | Use strbuf for struct xdiff_emit_state's remainder | Brian Downing | 2008-08-13 |
* | | Make xdi_diff_outf interface for running xdiff_outf diffs | Brian Downing | 2008-08-13 |
|/ |
|
* | xdl_diff: identify call sites. | Junio C Hamano | 2007-12-13 |
* | Per-path attribute based hunk header selection. | Junio C Hamano | 2007-07-06 |
* | Move buffer_is_binary() to xdiff-interface.h | Johannes Schindelin | 2007-06-04 |
* | move read_mmfile() into xdiff-interface | Johannes Schindelin | 2006-12-21 |
* | Match ofs/cnt types in diff interface. | Junio C Hamano | 2006-04-06 |
* | combine-diff: move the code to parse hunk-header into common library. | Junio C Hamano | 2006-04-05 |
* | combine-diff: refactor built-in xdiff interface. | Junio C Hamano | 2006-04-05 |