summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2019-08-18 19:16:37 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-20 11:09:21 -0700
commitb99bfc7a6c3b78574d171ada0fbcad3af2919f76 (patch)
tree00a183a56de76d69e44ce5b01986d399e8e0551c /git-merge-one-file.sh
parentt3305: make hash size independent (diff)
downloadtgif-b99bfc7a6c3b78574d171ada0fbcad3af2919f76.tar.xz
t3306: abstract away SHA-1-specific constants
Adjust the test so that it computes variables for object IDs instead of using hard-coded hashes. Convert some single-line heredocs into inline uses of echo now that they can be expressed succinctly. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions