doc: moved merge.* config variables into separate merge-config.txt
authorSZEDER Gábor <szeder@ira.uka.de>
Sun, 6 Apr 2008 01:23:42 +0000 (03:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700)
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>
No differences found