![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jul 2008 07:50:59 +0000 (00:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jul 2008 08:05:47 +0000 (01:05 -0700) | ||
| commit | 4393c2374101fef9053643f9b4ec638b05bd0b26 | |
| tree | 6148268877dac7ac97bf39628ef92c97680d3c33 | tree | snapshot |
| parent | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df | commit | diff |
Teach merge.log to "git-merge" again
The command forgot the configuration variable when rewritten in C.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The command forgot the configuration variable when rewritten in C.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |