2 Commits

Author	SHA1	Message	Date
Junio C Hamano	9688a882e1	Documentation: recursive is the default strategy these days. ... We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-08 14:04:33 -08:00
Jon Loeliger	bb73d73c08	Refactor merge strategies into separate includable file. ... Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-11-06 10:31:48 -08:00