summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:43:55 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-27 10:43:55 -0800
commit38e79b1fdab9244e1727d0698afcf3bb8956c0a4 (patch)
tree6c89b8e757f0206366b1f613eea3551b39a2ec15 /mergetools/opendiff
parentMerge branch 'sb/submodule-update-reset-fix' into maint (diff)
parentbisect: debug: convert struct object to object_id (diff)
downloadtgif-38e79b1fdab9244e1727d0698afcf3bb8956c0a4.tar.xz
Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maint
Fix for a commented-out code to adjust it to a rather old API change. * ys/bisect-object-id-missing-conversion-fix: bisect: debug: convert struct object to object_id
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions