diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-10 00:50:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-10 01:05:47 -0700 |
| commit | 4393c2374101fef9053643f9b4ec638b05bd0b26 (patch) | |
| tree | 6148268877dac7ac97bf39628ef92c97680d3c33 /builtin-diff.c | |
| parent | 1c7b76be7d620bbaf2e6b8417f04012326bbb9df (diff) | |
| download | git-4393c2374101fef9053643f9b4ec638b05bd0b26.tar.gz git-4393c2374101fef9053643f9b4ec638b05bd0b26.tar.xz | |
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>
Diffstat (limited to 'builtin-diff.c')
0 files changed, 0 insertions, 0 deletions