org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	move read_mmfile() into xdiff-interface	Johannes Schindelin	2006-12-21
\| \| \| \| \| \| \| \|	read_file() was a useful function if you want to work with the xdiff stuff, so it was renamed and put into a more central place. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	merge-file: support -p and -q; fix compile warnings	Johannes Schindelin	2006-12-06
\| \| \| \| \| \| \| \|	Now merge-file also understands --stdout and --quiet options. While at it, two compile warnings were fixed. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Add builtin merge-file, a minimal replacement for RCS merge	Johannes Schindelin	2006-12-06
	merge-file has the same syntax as RCS merge, but supports only the "-L" option. For good measure, a test is added, which is quite minimal, though. [jc: further fix for compliation errors included.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>