summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:35 -0800
commitb486d2ee811d7471e7a31cd315eddca1be79fc19 (patch)
treee89a588a70e654c01320cc0f7ae5e0f849a3d542 /t/t7605-merge-resolve.sh
parentThe third batch for 2.26 (diff)
parentsha1-file: document how to use pretend_object_file (diff)
downloadtgif-b486d2ee811d7471e7a31cd315eddca1be79fc19.tar.xz
Merge branch 'jn/pretend-object-doc'
Warn programmers about pretend_object_file() that allows the code to tentatively use in-core objects. * jn/pretend-object-doc: sha1-file: document how to use pretend_object_file
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions