![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 6 Apr 2008 01:23:42 +0000 (03:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Apr 2008 02:28:18 +0000 (19:28 -0700) | ||
| commit | f5a84c372f8f044899dde91f1a415d2bf963377e | |
| tree | 8817c96e047da6b4c2ca191b4632933c7ad80ea5 | tree | snapshot |
| parent | f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f | commit | diff |
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>
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>
| Documentation/config.txt | diff | blob | history | |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-config.txt | [new file with mode: 0644] | blob |