aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-31 14:12:08 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-31 14:12:08 -0700
commit257f6f404bbb90512262dbb6f7f873a61bf381dc (patch)
tree031f26bed9ae0ec54b9953bf9156ddb0840d557a /combine-diff.c
parentMerge branch 'es/t1500-modernize' (diff)
parentMore topics for 2.8.4 (diff)
downloadgit-257f6f404bbb90512262dbb6f7f873a61bf381dc.tar.gz
git-257f6f404bbb90512262dbb6f7f873a61bf381dc.zip
Merge branch 'maint'
* maint: More topics for 2.8.4
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions