summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-10 00:50:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-10 01:05:47 -0700
commit4393c2374101fef9053643f9b4ec638b05bd0b26 (patch)
tree6148268877dac7ac97bf39628ef92c97680d3c33 /t/t6010-merge-base.sh
parentBuild in merge (diff)
downloadtgif-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 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions