git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge-file: handle freopen() failure	René Scharfe	2008-12-27	1	-2/+5
*	parse-opt: migrate builtin-merge-file.	Pierre Habouzit	2008-10-03	1	-31/+37
*	merge.conflictstyle: choose between "merge" and "diff3 -m" styles	Junio C Hamano	2008-08-31	1	-0/+9
*	xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less	Junio C Hamano	2008-08-31	1	-3/+1
*	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	2008-08-31	1	-2/+8
*	Merge branch 'maint'	Junio C Hamano	2008-03-14	1	-1/+2
\|\
\| *	merge-file: handle empty files gracefully	Johannes Schindelin	2008-03-14	1	-1/+2
* \|	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	Johannes Schindelin	2008-02-18	1	-1/+1
\|/
*	Make every builtin-*.c file #include "builtin.h"	Peter Hagervall	2007-07-15	1	-3/+4
*	git-merge-file: refuse to merge binary files	Johannes Schindelin	2007-06-05	1	-1/+5
*	move read_mmfile() into xdiff-interface	Johannes Schindelin	2006-12-22	1	-18/+2
*	merge-file: support -p and -q; fix compile warnings	Johannes Schindelin	2006-12-06	1	-9/+16
*	Add builtin merge-file, a minimal replacement for RCS merge	Johannes Schindelin	2006-12-06	1	-0/+72