summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-16 08:03:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-11-16 08:03:15 (GMT)
commitc6b53c8684966b3e22d0f26dc981a8b4a0b03ce7 (patch)
tree9eea5f998b62d6b2cf047b352bf7294adc55c40f /ll-merge.h
parent5e9cb8666bae6a5c8adcb26e3f46b8a5fe5be589 (diff)
parentc30eb852e281d55b04465b7814e00396893f74f3 (diff)
downloadgit-c6b53c8684966b3e22d0f26dc981a8b4a0b03ce7.zip
git-c6b53c8684966b3e22d0f26dc981a8b4a0b03ce7.tar.gz
git-c6b53c8684966b3e22d0f26dc981a8b4a0b03ce7.tar.bz2
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 'll-merge.h')
0 files changed, 0 insertions, 0 deletions