| commit | e098368b5b990eb05cbc60a271ab6d731820e0c2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Feb 2008 18:59:17 +0000 (11 10:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Feb 2008 21:11:37 +0000 (11 13:11 -0800) | ||
| tree | 7583401a48924356f9d9c92204d891eb66a7a299 | treesnapshot (tar.gz zip) |
| parent | 111dd25f3c34ccad101047c32e89d1bb87136f60 | commitdiff |
merge-recursive.c: guard config parser from value=NULL
merge.default, merge.*.{name,driver} expect a string value
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge.default, merge.*.{name,driver} expect a string value
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |