summaryrefslogtreecommitdiff
path: root/xdiff/xprepare.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-02 13:17:45 -0800
commit305fcf42b4dde316ba0b2e6433c1e5a1d6ef864f (patch)
tree2aba3f425ddcbbd1a31f8d32a6eee1bf0d79378f /xdiff/xprepare.h
parentMerge branch 'js/t7006-cleanup' (diff)
parentsvn: use correct variable name for short OID (diff)
downloadtgif-305fcf42b4dde316ba0b2e6433c1e5a1d6ef864f.tar.xz
Merge branch 'bc/svn-hash-oid-fix'
A recent oid->hash conversion missed one spot, breaking "git svn". * bc/svn-hash-oid-fix: svn: use correct variable name for short OID
Diffstat (limited to 'xdiff/xprepare.h')
0 files changed, 0 insertions, 0 deletions