summaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2018-03-23 18:21:21 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-26 10:05:55 -0700
commit4a7c05f7d7f17cd7a42fa944e79c2ef294cb17b6 (patch)
treed38a31f35f296d3928c565584eab1b2240b15f83 /t/t6037-merge-ours-theirs.sh
parentbd27f50c801410433542a31122985b7d808b0a7f (diff)
downloadgit-sb/object-store.tar.gz
sha1_file: allow sha1_loose_object_info to handle arbitrary repositoriessb/object-store
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions