summaryrefslogtreecommitdiff
path: root/mergetools/smerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-25 14:27:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-25 14:27:14 -0700
commit2c30e34e1a50f9d14fce8f97f3639ac0ebccd819 (patch)
tree746f6fa7b17b115ec55e9c8cc0280e4e01b291e8 /mergetools/smerge
parentMerge branch 'es/git-debugger-doc' into maint (diff)
parentbisect--helper: verify HEAD could be parsed before continuing (diff)
downloadtgif-2c30e34e1a50f9d14fce8f97f3639ac0ebccd819.tar.xz
Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint
Code cleanup. * js/bisect-helper-check-get-oid-return-value: bisect--helper: verify HEAD could be parsed before continuing
Diffstat (limited to 'mergetools/smerge')
0 files changed, 0 insertions, 0 deletions