summaryrefslogtreecommitdiff
path: root/config.mak.in
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-12-22 23:14:59 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-12-22 23:14:59 -0800
commit0e545f75169e2c260dfb4445203c23cafdfc76ef (patch)
treee9863c4dbd66a9207e24ac3b8015e4475ed6bfa9 /config.mak.in
parentDon't dereference NULL upon lookup failure. (diff)
downloadtgif-0e545f75169e2c260dfb4445203c23cafdfc76ef.tar.xz
Documentation: describe 'union' low-level merge driver
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.mak.in')
0 files changed, 0 insertions, 0 deletions