Log - 66d2e04ec9856b5ef667f5241774749d079a5109 - jrn/git

3319e60 xdiff: remove emit_func() and xdi_diff_hunks() by René Scharfe · 13 years ago
6b6f5d4 Merge branch 'maint-1.7.0' into maint by Junio C Hamano · 15 years ago
dfea790 remove ecb parameter from xdi_diff_outf() by René Scharfe · 15 years ago
06b6593 refactor duplicated fill_mm() in checkout and merge-recursive by Michael Lukashov · 15 years ago
8cfe5f1 userdiff: add xdiff_clear_find_func() by René Scharfe · 16 years ago
86295bb add xdi_diff_hunks() for callers that only need hunk lengths by René Scharfe · 16 years ago
9800c0d Merge branch 'bc/master-diff-hunk-header-fix' by Shawn O. Pearce · 16 years ago
9ba929e Merge branch 'jc/better-conflict-resolution' by Shawn O. Pearce · 16 years ago
dde4af4 Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix by Junio C Hamano · 16 years ago
a013585 diff.c: associate a flag with each pattern and use it for compiling regex by Brandon Casey · 16 years ago
b541248 merge.conflictstyle: choose between "merge" and "diff3 -m" styles by Junio C Hamano · 17 years ago
8a3f524 xdiff-interface: hide the whole "xdiff_emit_state" business from the caller by Junio C Hamano · 17 years ago
b463776 Use strbuf for struct xdiff_emit_state's remainder by Brian Downing · 17 years ago
c99db9d2 Make xdi_diff_outf interface for running xdiff_outf diffs by Brian Downing · 17 years ago
c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
f258475 Per-path attribute based hunk header selection. by Junio C Hamano · 18 years ago
6bfce93 Move buffer_is_binary() to xdiff-interface.h by Johannes Schindelin · 18 years ago
7cab588 move read_mmfile() into xdiff-interface by Johannes Schindelin · 18 years ago
a0fd314 Match ofs/cnt types in diff interface. by Junio C Hamano · 19 years ago
c1e335a combine-diff: move the code to parse hunk-header into common library. by Junio C Hamano · 19 years ago
d9ea73e combine-diff: refactor built-in xdiff interface. by Junio C Hamano · 19 years ago