diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:43:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:43:55 -0800 |
| commit | 38e79b1fdab9244e1727d0698afcf3bb8956c0a4 (patch) | |
| tree | 6c89b8e757f0206366b1f613eea3551b39a2ec15 /git-gui/lib/mergetool.tcl | |
| parent | Merge branch 'sb/submodule-update-reset-fix' into maint (diff) | |
| parent | bisect: debug: convert struct object to object_id (diff) | |
| download | tgif-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 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions