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