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

	Commit message (Expand)	Author	Age	Files	Lines
*	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	2010-03-20	1	-2/+3
*	xdl_merge(): add optional ancestor label to diff3-style output	Jonathan Nieder	2010-03-20	1	-0/+1
*	refactor merge flags into xmparam_t	Bert Wesarg	2010-03-02	1	-6/+5
*	make union merge an xdl merge favor	Bert Wesarg	2010-03-02	1	-0/+1
*	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	2010-01-20	1	-1/+8
\|\
\| *	xdl_merge(): allow passing down marker_size in xmparam_t	Junio C Hamano	2010-01-16	1	-0/+3
\| *	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	2010-01-16	1	-1/+5
* \|	git-merge-file --ours, --theirs	Junio C Hamano	2009-11-29	1	-1/+7
\|/
*	Merge branch 'js/patience-diff'	Junio C Hamano	2009-01-23	1	-0/+1
\|\
\| *	Implement the patience diff algorithm	Johannes Schindelin	2009-01-07	1	-0/+1
* \|	diff: add option to show context between close hunks	René Scharfe	2008-12-29	1	-0/+1
\|/
*	Allow alternate "low-level" emit function from xdl_diff	Brian Downing	2008-10-25	1	-0/+1
*	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	2008-08-30	1	-0/+6
*	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	Johannes Schindelin	2008-02-18	1	-0/+1
*	Per-path attribute based hunk header selection.	Junio C Hamano	2007-07-06	1	-0/+4
*	War on whitespace	Junio C Hamano	2007-06-07	1	-1/+0
*	teach diff machinery about --ignore-space-at-eol	Johannes Schindelin	2007-02-13	1	-1/+2
*	xdiff: add xdl_merge()	Johannes Schindelin	2006-12-02	1	-0/+7
*	xdiff: generate "anti-diffs" aka what is common to two files	Linus Torvalds	2006-06-28	1	-0/+1
*	Teach diff about -b and -w flags	Johannes Schindelin	2006-06-23	1	-0/+3
*	xdiff: Show function names in hunk headers.	Mark Wooding	2006-03-27	1	-0/+3
*	Use a real built-in diff generator	Linus Torvalds	2006-03-25	1	-0/+91