diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | f5a84c372f8f044899dde91f1a415d2bf963377e (patch) | |
| tree | 8817c96e047da6b4c2ca191b4632933c7ad80ea5 /lockfile.c | |
| parent | f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (diff) | |
| download | git-f5a84c372f8f044899dde91f1a415d2bf963377e.tar.gz git-f5a84c372f8f044899dde91f1a415d2bf963377e.tar.xz | |
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>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions