2 Commits

Author	SHA1	Message	Date
SZEDER Gábor	3e6c0a3fe3	add 'merge.stat' config variable ... This variable has the same effect, as 'merge.diffstat'. Also mention it in the documentation. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-04-12 19:28:18 -07:00
SZEDER Gábor	f5a84c372f	doc: moved merge.* config variables into separate merge-config.txt ... Include the new file from config.txt and git-merge.txt. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-04-12 19:28:18 -07:00