delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29	1	-0/+2
\|\
\| *	merge.conflictstyle: choose between "merge" and "diff3 -m" styles	Junio C Hamano	2008-08-30	1	-0/+2
* \|	xdiff-interface: hide the whole "xdiff_emit_state" business from the caller	Junio C Hamano	2008-08-14	1	-9/+2
* \|	Use strbuf for struct xdiff_emit_state's remainder	Brian Downing	2008-08-13	1	-2/+2
* \|	Make xdi_diff_outf interface for running xdiff_outf diffs	Brian Downing	2008-08-13	1	-1/+3
\|/
*	xdl_diff: identify call sites.	Junio C Hamano	2007-12-13	1	-0/+1
*	Per-path attribute based hunk header selection.	Junio C Hamano	2007-07-06	1	-0/+2
*	Move buffer_is_binary() to xdiff-interface.h	Johannes Schindelin	2007-06-04	1	-0/+1
*	move read_mmfile() into xdiff-interface	Johannes Schindelin	2006-12-21	1	-0/+1
*	Match ofs/cnt types in diff interface.	Junio C Hamano	2006-04-06	1	-2/+2
*	combine-diff: move the code to parse hunk-header into common library.	Junio C Hamano	2006-04-05	1	-0/+3
*	combine-diff: refactor built-in xdiff interface.	Junio C Hamano	2006-04-05	1	-0/+18