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)
commitf5a84c3...2f8f044899dde91f1a415d2bf963377e
tree8817c96...047da6b4c2ca191b4632933c7ad80ea5copy hash to clipboard (tree)
parentf43e2fd...3b50d5a82a34bb3e4f848cb38bf93b7fcopy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-merge.txt
Documentation/merge-config.txt [new file with mode: 0644]