summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-07 00:09:33 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-07 00:09:33 -0800
commit4c6e8aa8f001fa9619dc891c501d0d4389583353 (patch)
tree82ca8432fa580b24215d68aacd847b844ce4db06 /merge-recursive.c
parenta19528c9fd85454204ff76cd58923072c83594b1 (diff)
parentcdad8170b223a73dc37197d5ba78a3ac7b824406 (diff)
downloadgit-4c6e8aa8f001fa9619dc891c501d0d4389583353.tar.gz
Merge branch 'mk/gitweb-feature'
* mk/gitweb-feature: gitweb: unify boolean feature subroutines
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions