summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-16 00:03:15 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-16 00:03:15 -0800
commitc6b53c8684966b3e22d0f26dc981a8b4a0b03ce7 (patch)
tree9eea5f998b62d6b2cf047b352bf7294adc55c40f /t/t6024-recursive-merge.sh
parentMerge branch 'jk/maint-add-p-empty' into maint (diff)
parentpre-commit.sample: Diff against the empty tree when HEAD is invalid (diff)
downloadtgif-c6b53c8684966b3e22d0f26dc981a8b4a0b03ce7.tar.xz
Merge branch 'bs/maint-pre-commit-hook-sample' into maint
* bs/maint-pre-commit-hook-sample: pre-commit.sample: Diff against the empty tree when HEAD is invalid
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions