summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:05 -0700
commitbdf204f28db5cdf5201dded37c5b40f3f432e0cf (patch)
tree751977812225bd5ba1a84a8974d4d8c4b86c9344 /merge-recursive.h
parentMerge branch 'pt/xdg-config-path' into maint (diff)
parentfmt-merge-msg: plug small leak of commit buffer (diff)
downloadtgif-bdf204f28db5cdf5201dded37c5b40f3f432e0cf.tar.xz
Merge branch 'jc/plug-fmt-merge-msg-leak' into maint
* jc/plug-fmt-merge-msg-leak: fmt-merge-msg: plug small leak of commit buffer
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions