summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 03:39:01 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-26 03:39:01 -0700
commit7608d4bf977d864a9409d366e25de9740b291d51 (patch)
tree13a530ba21c810137435f2a2ea7832c8d747e545 /combine-diff.c
parentMerge branch 'pb/config' into next (diff)
parentMerge branch 'master' into jc/cache-tree (diff)
downloadtgif-7608d4bf977d864a9409d366e25de9740b291d51.tar.xz
Merge branch 'jc/cache-tree' into next
* jc/cache-tree: commit-tree: allow generic object name for the tree as well. Makefile: remove and create xdiff library from scratch. t0000-basic: Add ls-tree recursive test back.
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions