summaryrefslogtreecommitdiff
path: root/t/t6038-merge-text-auto.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2014-12-24 01:18:38 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-12-29 09:33:25 -0800
commit8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 (patch)
treebcdd30a4cdfc456de9a65be59b44c36a1dc05ab8 /t/t6038-merge-text-auto.sh
parentSync with maint (diff)
downloadtgif-8d025b7cafdd976d1ba34fd8b2df8b669e1cd282.tar.xz
merge: release strbuf after use in suggest_conflicts()
Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6038-merge-text-auto.sh')
0 files changed, 0 insertions, 0 deletions