tree 8817c96e047da6b4c2ca191b4632933c7ad80ea5
parent f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f
author SZEDER Gábor <szeder@ira.uka.de> 1207445022 +0200
committer Junio C Hamano <gitster@pobox.com> 1208053698 -0700

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>